system settings
git clone https://git.lucas.co/cce-system-interface.git
chore: drop the status bar page-description label + per-frame debug dumps
The status bar keeps its strip and page dropdown; the per-page
description text (and the update_status_text plumbing behind it) is
gone. Also strips the WINDOW_PC/PAGE_PC/SCROLL_DEBUG eprintln spam
that fired every frame.
Co-Authored-By: Claude Fable 5 <[email protected]>
src/input_handler.rs | 1 -
src/main.rs | 21 +--------------------
src/renderer.rs | 28 ++++------------------------
3 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/src/input_handler.rs b/src/input_handler.rs
index 17a24f1..f7b86e2 100644
--- a/src/input_handler.rs
+++ b/src/input_handler.rs
@@ -162,7 +162,6 @@ impl SystemInterface {
self.app.current_page = new_page;
self.current_page_shared.store(idx as u8, std::sync::atomic::Ordering::SeqCst);
self.scroll_y = 0.0;
- self.update_status_text();
}
}
self.needs_rebuild = true;
diff --git a/src/main.rs b/src/main.rs
index ff6c17d..3e82827 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -91,8 +91,7 @@ struct SystemInterface {
page_scroll_bar: cce_ui::widget::Adapted<crate::scroll_bar::ScrollBar>,
content_h: f32,
// Root Backplate + StatusBar DISSOLVED (Phase 6s): the window plate and the status
- // bar are emitted as tuples in rebuild_layout; this is the bar's text.
- status_text: String,
+ // bar are emitted as tuples in rebuild_layout.
sans_serif_family: String,
serif_family: String,
monospace_family: String,
@@ -179,7 +178,6 @@ impl cce_ui::engine::Application for SystemInterface {
page_dropdown,
page_scroll_bar: crate::scroll_bar::ScrollBar::new(),
content_h: 0.0,
- status_text: String::new(),
sans_serif_family: sans_family,
serif_family,
monospace_family,
@@ -195,8 +193,6 @@ impl cce_ui::engine::Application for SystemInterface {
};
this.app.system_info.sender = Some(this.sender.clone());
- this.update_status_text();
-
this.rebuild_layout(820.0, 680.0);
this.needs_rebuild = true;
this
@@ -533,21 +529,6 @@ impl SystemInterface {
}
}
- fn update_status_text(&mut self) {
- let msg = match self.app.current_page {
- Page::Accounts => "Accounts: Manage your online identities, keys, and credentials.",
- Page::Audio => "Audio Settings: Configure volume levels, inputs, and sound options.",
- Page::Fonts => "Fonts Settings: Adjust font family preferences, typography, and scaling.",
- Page::Packages => "Package Manager: Search, install, and update system packages.",
- Page::Processes => "System Monitor: Inspect running tasks, system resources, and services.",
- Page::Notifications => "Notifications: Configure system notifications, sound, and duration.",
- Page::Radios => "Network Settings: Configure wireless networks, radios, and connections.",
- Page::Storage => "Storage Settings: Manage local disks, partition structures, and backup runs.",
- Page::System => "System Settings: System properties, power management, and update checks.",
- };
- self.status_text = msg.to_string();
- }
-
}
fn main() {
diff --git a/src/renderer.rs b/src/renderer.rs
index 26ad154..a59463a 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -188,20 +188,6 @@ impl SystemInterface {
let sb_theme = cce_ui::colors::backplate_statusbar_color();
let sb_bg = if sb_theme[3] > 0.001 { sb_theme } else { cce_ui::color::STATUS_BG };
rounded.push((sb_bg, 0.0, sb_y, logical_sw, self.status_height, plate_radius, (false, false, true, true)));
- if !self.status_text.is_empty() {
- let (_, sb_font_size) = cce_ui::layout::statusbar_font_parsed();
- let sb_size = if sb_font_size > 0.0 { sb_font_size } else { 12.0 };
- let c = cce_ui::colors::backplate_statusbar_text_color();
- // Same u8 round-trip the legacy TextLabel path applied.
- let sb_color = [
- ((c[0] * 255.0) as u8) as f32 / 255.0,
- ((c[1] * 255.0) as u8) as f32 / 255.0,
- ((c[2] * 255.0) as u8) as f32 / 255.0,
- 1.0,
- ];
- let sb_text_y = cce_ui::layout::align_text_y(sb_y, self.status_height, sb_size, 0.0);
- wtexts.push((self.status_text.clone(), sb_size, 12.0, sb_text_y, sb_color, None, Some([0.0, 0.0, logical_sw, logical_sh])));
- }
collect_window_child(&self.page_dropdown, &self.ui_context, logical_sw, logical_sh, plate_radius, &mut plain, &mut rounded, &mut wtexts);
if self.search_open {
@@ -251,10 +237,8 @@ impl SystemInterface {
// CSD Titlebar removed
- eprintln!("WINDOW_PC_RECTS_LEN: {}", window_pc.rects.len());
for pc_part in &[window_pc] {
- for (idx, (c, x, y, w, h, r, corners)) in pc_part.rects.iter().enumerate() {
- eprintln!("WINDOW_PC_RECT idx={}: color={:?}, x={}, y={}, w={}, h={}", idx, c, x, y, w, h);
+ for (c, x, y, w, h, r, corners) in pc_part.rects.iter() {
let wx = *x * s;
let wy = *y * s;
let ww = *w * s;
@@ -267,8 +251,7 @@ impl SystemInterface {
corners: *corners,
});
}
- for (idx, (t, size, x, y, tc, font_opt, bounds)) in pc_part.texts.iter().enumerate() {
- eprintln!("WINDOW_PC_TEXT idx={}: text='{}', size={}, x={}, y={}, bounds={:?}", idx, t, size, x, y, bounds);
+ for (t, size, x, y, tc, font_opt, bounds) in pc_part.texts.iter() {
texts.push((t.clone(), *size, *x, *y, *tc, font_opt.clone(), *bounds));
}
}
@@ -320,7 +303,6 @@ impl SystemInterface {
max_y = max_y.max(base.y + base.h);
}
self.max_scroll_y = (max_y - lch).max(0.0);
- eprintln!("SCROLL_DEBUG: max_y={}, lch={}, max_scroll_y={}, scroll_y={}", max_y, lch, self.max_scroll_y, self.scroll_y);
static mut FRAME_COUNT: usize = 0;
unsafe {
FRAME_COUNT += 1;
@@ -339,8 +321,7 @@ impl SystemInterface {
let scroll_offset_y = self.scroll_y;
- for (idx, (c, x, y, w, h, r, corners)) in pc.rects.iter().enumerate() {
- eprintln!("PAGE_PC_RECT idx={}: color={:?}, x={}, y={}, w={}, h={}", idx, c, x, y, w, h);
+ for (c, x, y, w, h, r, corners) in pc.rects.iter() {
let wx = *x * s;
let mut wy = (*y - scroll_offset_y) * s;
let ww = *w * s;
@@ -367,8 +348,7 @@ impl SystemInterface {
corners: *corners,
});
}
- for (idx, (t, size, x, y, tc, font_opt, bounds)) in pc.texts.iter().enumerate() {
- eprintln!("PAGE_PC_TEXT idx={}: text='{}', size={}, x={}, y={}, bounds={:?}", idx, t, size, x, y, bounds);
+ for (t, size, x, y, tc, font_opt, bounds) in pc.texts.iter() {
let shifted_bounds = bounds.map(|[bl, bt, br, bb]| {
[bl, bt - scroll_offset_y, br, bb - scroll_offset_y]
});