writeas/writeas-gtk
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Refactor after removing custom dark mode.

Browse Source
This commit is contained in:
Adrian Cochrane 2018-08-25 10:45:10 +12:00
parent 409c55897a
commit e948f63fb1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/window.vala
View File

@ -107,7 +107,6 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
private static bool supports_dark_theme() { private static bool supports_dark_theme() {
var theme = Gtk.Settings.get_default().gtk_theme_name; var theme = Gtk.Settings.get_default().gtk_theme_name;
stdout.printf("%s\n", theme);
return Gtk.CssProvider.get_named(theme, null).to_string() != return Gtk.CssProvider.get_named(theme, null).to_string() !=
Gtk.CssProvider.get_named(theme, "dark").to_string(); Gtk.CssProvider.get_named(theme, "dark").to_string();
} }
@ -136,7 +135,7 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
darkmode_button.toggled.connect(() => { darkmode_button.toggled.connect(() => {
settings.gtk_application_prefer_dark_theme = darkmode_button.active; settings.gtk_application_prefer_dark_theme = darkmode_button.active;
dark_mode = darkmode_button.active; dark_mode = darkmode_button.active;
adjust_text_style(!is_initializing); if (!is_initializing) theme_save();
}); });
if (supports_dark_theme()) header.pack_end(darkmode_button); if (supports_dark_theme()) header.pack_end(darkmode_button);
@ -214,17 +213,22 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),
cur_styles, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); cur_styles, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
if (save_theme && loaded_theme) { if (save_theme) theme_save();
} catch (Error e) {
warning(e.message);
}
}
private void theme_save() {
if (!loaded_theme) return;
theme.set_boolean("Theme", "darkmode", dark_mode); theme.set_boolean("Theme", "darkmode", dark_mode);
theme.set_integer("Theme", "fontsize", font_size); theme.set_integer("Theme", "fontsize", font_size);
theme.set_string("Post", "font", font); theme.set_string("Post", "font", font);
theme.set_string("Post", "fontstyle", fontstyle); theme.set_string("Post", "fontstyle", fontstyle);
try {
theme.save_to_file(get_data_dir() + "/prefs.ini"); theme.save_to_file(get_data_dir() + "/prefs.ini");
} } catch (FileError err) {/* Oh well. */}
} catch (Error e) {
warning(e.message);
}
} }
private string publish() { private string publish() {