diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-06-25 13:57:00 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-08 21:04:16 +0000 |
| commit | 81019dc3e6a9eb968aa085e25817674dfc875392 (patch) | |
| tree | 9f2315c908713690e6d8b597c8af3daf9deda77d /src | |
| parent | fix issue on theme change (diff) | |
| download | inkscape-81019dc3e6a9eb968aa085e25817674dfc875392.tar.gz inkscape-81019dc3e6a9eb968aa085e25817674dfc875392.zip | |
comment uneeded header
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 21 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.h | 2 | ||||
| -rw-r--r-- | src/ui/dialog/selectorsdialog.cpp | 2 |
3 files changed, 10 insertions, 15 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 4aa6495ef..1da02307b 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -45,9 +45,9 @@ #include "shortcuts.h" #include "verbs.h" +/* #include "display/cairo-utils.h" */ #include "display/canvas-grid.h" #include "display/nr-filter-gaussian.h" -#include "display/cairo-utils.h" #include "extension/internal/gdkpixbuf-input.h" @@ -669,8 +669,7 @@ void InkscapePreferences::resetIconsColors(bool themechange) return; } if (prefs->getBool("/theme/symbolicDefaultColors", true) || - !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) - { + !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) { auto const screen = Gdk::Screen::get_default(); if (INKSCAPE.colorizeprovider) { Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider); @@ -719,10 +718,7 @@ void InkscapePreferences::resetIconsColors(bool themechange) } } -void InkscapePreferences::resetIconsColorsWrapper() -{ - resetIconsColors(false); -} +void InkscapePreferences::resetIconsColorsWrapper() { resetIconsColors(false); } void InkscapePreferences::changeIconsColors() { @@ -766,8 +762,7 @@ void InkscapePreferences::toggleSymbolic() _symbolic_base_colors.set_sensitive(true); Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); if (prefs->getBool("/theme/symbolicDefaultColors", true) || - !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) - { + !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) { resetIconsColors(); } else { changeIconsColors(); @@ -876,8 +871,7 @@ void InkscapePreferences::symbolicThemeCheck() } if (symbolic) { if (prefs->getBool("/theme/symbolicDefaultColors", true) || - !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) - { + !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) { resetIconsColors(); } else { changeIconsColors(); @@ -936,9 +930,10 @@ Glib::RefPtr< Gdk::Pixbuf > sp_mix_colors() return pixbuf; } */ -void InkscapePreferences::changeIconsColor(guint32 /*color*/) { +void InkscapePreferences::changeIconsColor(guint32 /*color*/) +{ changeIconsColors(); -/* _complementary_colors->set(sp_mix_colors()); */ + /* _complementary_colors->set(sp_mix_colors()); */ } void InkscapePreferences::initPageUI() diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index 638ca53c2..0902d4d11 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -250,7 +250,7 @@ protected: UI::Widget::PrefColorPicker _symbolic_warning_color; UI::Widget::PrefColorPicker _symbolic_error_color; UI::Widget::PrefColorPicker _symbolic_success_color; -/* Gtk::Image *_complementary_colors; */ + /* Gtk::Image *_complementary_colors; */ UI::Widget::PrefCombo _misc_small_toolbar; UI::Widget::PrefCombo _misc_small_secondary; UI::Widget::PrefCombo _misc_small_tools; diff --git a/src/ui/dialog/selectorsdialog.cpp b/src/ui/dialog/selectorsdialog.cpp index 9580cd8a1..eda036c58 100644 --- a/src/ui/dialog/selectorsdialog.cpp +++ b/src/ui/dialog/selectorsdialog.cpp @@ -478,7 +478,7 @@ SelectorsDialog::~SelectorsDialog() Inkscape::XML::Node *SelectorsDialog::_getStyleTextNode() { g_debug("SelectorsDialog::_getStyleTextNode"); - + Inkscape::XML::Node *styleNode = nullptr; Inkscape::XML::Node *textNode = nullptr; |
