Skip to content

Commit 6ea5b7f

Browse files
Fix dark/light mode
1 parent 9d87621 commit 6ea5b7f

4 files changed

Lines changed: 14 additions & 10 deletions

File tree

example_configs/simulator.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ extruder = [ 200, 240, 280 ]
1111
heater_bed = [ 60, 70 ]
1212

1313
[ui]
14-
dark_mode = false
14+
dark_mode = true
1515
left_sidebar = ["files", "temperature", "move", "emergency_stop"]
1616
right_sidebar = ["fan", "macros", "console", "settings"]

src/ui_functions/settings_set_ui_settings.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ pub fn register_set_ui_settings(ui : &AppWindow, configuration : &OptionalUiConf
2828
let left_sidebar: Vec<i32> = configuration.left_sidebar.iter().map(|f| name_to_id(f)).collect();
2929
let right_sidebar: Vec<i32> = configuration.right_sidebar.iter().map(|f| name_to_id(f)).collect();
3030

31-
ui.global::<UiSettings>().set_dark_mode(configuration.dark_mode);
31+
if configuration.dark_mode {
32+
ui.global::<UiSettings>().invoke_set_dark_theme();
33+
} else {
34+
ui.global::<UiSettings>().invoke_set_light_theme();
35+
}
36+
3237
ui.global::<UiSettings>().set_left_sidebar(ModelRc::new(VecModel::from(left_sidebar)));
3338
ui.global::<UiSettings>().set_right_sidebar(ModelRc::new(VecModel::from(right_sidebar)));
34-
}
39+
}

ui/main.slint

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import { BottomBarWithStatusMessage } from "components/bottom-bar.slint";
1515
import { YesNoPrompt } from "components/yes-no-prompt.slint";
1616
export * from "state.slint";
1717

18-
19-
2018
component ExtruderPage inherits Page {
2119
header: "Extruder";
2220

ui/state.slint

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,15 @@ export global Utils
6868

6969
export global UiSettings
7070
{
71-
in-out property <bool> dark-mode;
7271
in-out property <[int]> left-sidebar: [0,1,2,3];
7372
in-out property <[int]> right-sidebar: [4,5,6,7];
7473

75-
changed dark-mode => {
76-
// TODO: This doesn't work
77-
debug("Dark mode changed to ");
78-
Palette.color-scheme = dark-mode ? ColorScheme.dark : ColorScheme.light;
74+
public function set_dark_theme() {
75+
Palette.color-scheme = ColorScheme.dark;
76+
}
77+
78+
public function set_light_theme() {
79+
Palette.color-scheme = ColorScheme.light;
7980
}
8081

8182
out property <[image]> id-to-image: [Icons.print, Icons.temperature, Icons.move, Icons.emergency_stop, Icons.fan, Icons.quick_action, Icons.console, Icons.settings];

0 commit comments

Comments
 (0)