Skip to content

Distinguish the menu and status bars #934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kisaraki wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −4
Open

Distinguish the menu and status bars #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions crates/edit/src/bin/edit/draw_menubar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use edit::helpers::*;
use edit::input::{kbmod, vk};
use edit::oklab::StraightRgba;
use edit::tui::*;
use stdext::arena_format;

Expand All @@ -12,8 +13,10 @@ use crate::state::*;

pub fn draw_menubar(ctx: &mut Context, state: &mut State) {
ctx.menubar_begin();
ctx.attr_background_rgba(state.menubar_color_bg);
ctx.attr_foreground_rgba(state.menubar_color_fg);
// EN: Keep the menu row visually distinct with a white background and black text.
// 中文：選單列固定使用白色背景與黑色文字，使其與編輯區清楚區隔。
ctx.attr_background_rgba(StraightRgba::from_rgba(0xffffffff));
ctx.attr_foreground_rgba(StraightRgba::from_rgba(0x000000ff));
{
let contains_focus = ctx.contains_focus();

Expand Down
7 changes: 5 additions & 2 deletions crates/edit/src/bin/edit/draw_statusbar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use edit::helpers::*;
use edit::icu;
use edit::input::vk;
use edit::lsh::LANGUAGES;
use edit::oklab::StraightRgba;
use edit::tui::*;
use stdext::arena::scratch_arena;
use stdext::arena_format;
Expand All @@ -18,8 +19,10 @@ use crate::state::*;
pub fn draw_statusbar(ctx: &mut Context, state: &mut State) {
ctx.table_begin("statusbar");
ctx.attr_focus_well();
ctx.attr_background_rgba(state.menubar_color_bg);
ctx.attr_foreground_rgba(state.menubar_color_fg);
// EN: Use a green status row with white text for a consistent high-contrast footer.
// 中文：狀態列固定使用綠色背景與白色文字，形成一致且高對比的頁尾。
ctx.attr_background_rgba(StraightRgba::from_rgba(0x008000ff));
ctx.attr_foreground_rgba(StraightRgba::from_rgba(0xffffffff));
ctx.table_set_cell_gap(Size { width: 2, height: 0 });
ctx.attr_intrinsic_size(Size { width: COORD_TYPE_SAFE_MAX, height: 1 });
ctx.attr_padding(Rect::two(0, 1));
Expand Down