system settings
git clone https://git.lucas.co/cce-system-interface.git
chore: TextBox -> Adapted<TextBox> (cce-ui Phase 5q migration)
Mechanical sweep for the migrated cce-ui TextBox: field/param types wrap
in Adapted<TextBox>, raw casts become .as_ptr_mut(), UFCS TextBox::focus
becomes Element::focus.
Co-Authored-By: Claude Fable 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_011vTEhEwTGYYhHRbh658SAc
src/input_handler.rs | 2 +-
src/main.rs | 2 +-
src/pages/accounts.rs | 12 ++++++------
src/pages/fonts.rs | 14 +++++++-------
src/pages/packages.rs | 2 +-
src/pages/processes.rs | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/input_handler.rs b/src/input_handler.rs
index c1c16cf..f8d3d8f 100644
--- a/src/input_handler.rs
+++ b/src/input_handler.rs
@@ -323,7 +323,7 @@ impl SystemInterface {
self.search_open = true;
self.search_box.set_value_string("");
self.search_query.clear();
- let search_box_ptr = &mut self.search_box as *mut cce_ui::widget::input::TextBox;
+ let search_box_ptr = self.search_box.as_ptr_mut();
unsafe {
(*search_box_ptr).focus();
}
diff --git a/src/main.rs b/src/main.rs
index ee5e39a..1767b9b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -85,7 +85,7 @@ struct SystemInterface {
scroll_logs: Vec<String>,
search_open: bool,
search_query: String,
- search_box: cce_ui::widget::input::TextBox,
+ search_box: cce_ui::widget::Adapted<cce_ui::widget::input::TextBox>,
}
diff --git a/src/pages/accounts.rs b/src/pages/accounts.rs
index 364606f..c6fab77 100644
--- a/src/pages/accounts.rs
+++ b/src/pages/accounts.rs
@@ -29,16 +29,16 @@ pub struct AccountsState {
pub accounts: Vec<AccountInfo>,
pub selected_idx: Option<usize>,
pub adding_new: bool,
- pub email_box: TextBox,
- pub password_box: TextBox,
- pub imap_box: TextBox,
- pub smtp_box: TextBox,
+ pub email_box: cce_ui::widget::Adapted<TextBox>,
+ pub password_box: cce_ui::widget::Adapted<TextBox>,
+ pub imap_box: cce_ui::widget::Adapted<TextBox>,
+ pub smtp_box: cce_ui::widget::Adapted<TextBox>,
pub status_msg: Option<String>,
pub status_msg_timer: f32,
pub oauth_listener_running: bool,
pub editing_oauth_creds: bool,
- pub oauth_client_id_box: TextBox,
- pub oauth_client_secret_box: TextBox,
+ pub oauth_client_id_box: cce_ui::widget::Adapted<TextBox>,
+ pub oauth_client_secret_box: cce_ui::widget::Adapted<TextBox>,
}
impl AccountsState {
diff --git a/src/pages/fonts.rs b/src/pages/fonts.rs
index 5913d3f..69c8749 100644
--- a/src/pages/fonts.rs
+++ b/src/pages/fonts.rs
@@ -45,13 +45,13 @@ pub struct FontsState {
pub terminal: String,
pub all_fonts: Vec<String>,
pub mono_fonts: Vec<String>,
- pub sans_box: TextBox,
- pub serif_box: TextBox,
- pub mono_box: TextBox,
- pub borders_box: TextBox,
- pub status_box: TextBox,
- pub fuzzel_box: TextBox,
- pub terminal_box: TextBox,
+ pub sans_box: cce_ui::widget::Adapted<TextBox>,
+ pub serif_box: cce_ui::widget::Adapted<TextBox>,
+ pub mono_box: cce_ui::widget::Adapted<TextBox>,
+ pub borders_box: cce_ui::widget::Adapted<TextBox>,
+ pub status_box: cce_ui::widget::Adapted<TextBox>,
+ pub fuzzel_box: cce_ui::widget::Adapted<TextBox>,
+ pub terminal_box: cce_ui::widget::Adapted<TextBox>,
pub borders_menu: cce_ui::widget::Adapted<Dropdown>,
pub status_menu: cce_ui::widget::Adapted<Dropdown>,
pub fuzzel_menu: cce_ui::widget::Adapted<Dropdown>,
diff --git a/src/pages/packages.rs b/src/pages/packages.rs
index 5efc22e..cd5899b 100644
--- a/src/pages/packages.rs
+++ b/src/pages/packages.rs
@@ -33,7 +33,7 @@ pub struct PackagesState {
pub installed: Vec<PackageInfo>,
pub updates: Vec<UpdateInfo>,
pub active_tab: PackageTab,
- pub search_box: TextBox,
+ pub search_box: cce_ui::widget::Adapted<TextBox>,
pub installed_list_box: List,
pub installed_items: Vec<cce_ui::widget::Adapted<cce_ui::widget::InteractiveListItem>>,
pub updates_list_box: List,
diff --git a/src/pages/processes.rs b/src/pages/processes.rs
index a58aacf..ad8a97b 100644
--- a/src/pages/processes.rs
+++ b/src/pages/processes.rs
@@ -33,7 +33,7 @@ pub struct ProcessesState {
pub services_loaded: bool,
pub services: Vec<ServiceInfo>,
pub services_active_tab: ServiceTab,
- pub services_search_box: TextBox,
+ pub services_search_box: cce_ui::widget::Adapted<TextBox>,
pub services_list_box: List,
pub service_items: Vec<cce_ui::widget::Adapted<cce_ui::widget::InteractiveListItem>>,
}