diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-06-21 20:34:09 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-08 21:04:16 +0000 |
| commit | a5a5e6514c63e5a822c6c5f560a69ed86ca967a2 (patch) | |
| tree | 81235e375cce03f10ecc444cdce893be52f25fe1 /src/ui/dialog/inkscape-preferences.cpp | |
| parent | Refctor of Adam Belis icons to fit new system and fix bug compiling (diff) | |
| download | inkscape-a5a5e6514c63e5a822c6c5f560a69ed86ca967a2.tar.gz inkscape-a5a5e6514c63e5a822c6c5f560a69ed86ca967a2.zip | |
Allow pop in front and disable color buttons view
Diffstat (limited to 'src/ui/dialog/inkscape-preferences.cpp')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 723d69500..a19f71d4d 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -797,11 +797,7 @@ void InkscapePreferences::themeChange() window->get_style_context()->add_class("bright"); window->get_style_context()->remove_class("dark"); } - if (!prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) { - resetIconsColors(); - } else { - changeIconsColors(); - } + resetIconsColors(); INKSCAPE.signal_change_theme.emit(); } } @@ -1121,17 +1117,18 @@ void InkscapePreferences::initPageUI() _symbolic_success_color.get_style_context()->add_class("system_success_color"); _symbolic_warning_color.get_style_context()->add_class("system_warning_color"); _symbolic_error_color.get_style_context()->add_class("system_error_color"); + _symbolic_base_color.get_style_context()->add_class("symboliccolors"); + _symbolic_success_color.get_style_context()->add_class("symboliccolors"); + _symbolic_warning_color.get_style_context()->add_class("symboliccolors"); + _symbolic_error_color.get_style_context()->add_class("symboliccolors"); _symbolic_base_color.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor)); _symbolic_warning_color.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor)); _symbolic_success_color.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor)); _symbolic_error_color.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor)); - Glib::RefPtr<Gdk::Window> window = get_parent_window(); - if (window) { - _symbolic_base_color.setTransientFor(window); - _symbolic_success_color.setTransientFor(window); - _symbolic_warning_color.setTransientFor(window); - _symbolic_error_color.setTransientFor(window); - } + _symbolic_base_color.setParentDialog(this); + _symbolic_success_color.setParentDialog(this); + _symbolic_warning_color.setParentDialog(this); + _symbolic_error_color.setParentDialog(this); Gtk::Box *icon_buttons = Gtk::manage(new Gtk::Box()); icon_buttons->pack_start(_symbolic_base_color, true, true, 4); _page_theme.add_line(false, "", *icon_buttons, _("Icon color"), |