diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-06-19 16:37:13 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-08 21:04:14 +0000 |
| commit | 17187618d32ef44dfde4aa192f2d33a135c28d07 (patch) | |
| tree | 5a982cb9cbc71ba6bd8b5fdf62a591adeefed93a /src/ui | |
| parent | Allow good render of multiples stylesheets (diff) | |
| download | inkscape-17187618d32ef44dfde4aa192f2d33a135c28d07.tar.gz inkscape-17187618d32ef44dfde4aa192f2d33a135c28d07.zip | |
add improvements to color handling
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 16 | ||||
| -rw-r--r-- | src/ui/icon-loader.cpp | 13 |
2 files changed, 24 insertions, 5 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 9b8e35384..b81f97cb7 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -684,9 +684,19 @@ void InkscapePreferences::symbolicCustomColorsReset() { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); - prefs->setInt("/theme/" + themeiconname + "/symbolicSuccessColor", 0); - prefs->setInt("/theme/" + themeiconname + "/symbolicErrorColor", 0); - prefs->setInt("/theme/" + themeiconname + "/symbolicWaringColor", 0); + int colorset = 0x2E3436ff; + int colorsetsuccess = 0x4AD589ff; + int colorsetwarning = 0xF57900ff; + int colorseterror = 0xcc0000ff; + INKSCAPE.get_higlight_colors(colorset, colorsetsuccess, colorsetwarning, colorseterror); + _symbolic_color.setRgba32(colorset); + _symbolic_success_color.setRgba32(colorsetsuccess); + _symbolic_warning_color.setRgba32(colorsetwarning); + _symbolic_error_color.setRgba32(colorseterror); + prefs->setInt("/theme/" + themeiconname + "/symbolicSuccessColor",colorset); + prefs->setInt("/theme/" + themeiconname + "/symbolicColor", colorsetsuccess); + prefs->setInt("/theme/" + themeiconname + "/symbolicErrorColor", colorsetwarning); + prefs->setInt("/theme/" + themeiconname + "/symbolicWaringColor", colorseterror); symbolicCustomColors(); } diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp index 337a53aa4..a1696083d 100644 --- a/src/ui/icon-loader.cpp +++ b/src/ui/icon-loader.cpp @@ -69,15 +69,24 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) Glib::ustring css_str = ""; if (!prefs->getBool("/theme/symbolicIconsDefaultColor", true)) { using namespace Inkscape::IO::Resource; + int colorset = 0x2E3436ff; + int colorsetsuccess = 0x4AD589ff; + int colorsetwarning = 0xF57900ff; + int colorseterror = 0xcc0000ff; gchar colornamed[64]; gchar colornamedsuccess[64]; gchar colornamedwarning[64]; gchar colornamederror[64]; Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); - INKSCAPE.get_higlight_colors(colornamedsuccess, colornamedwarning, colornamederror); - int colorset = 0x2E3436ff; + INKSCAPE.get_higlight_colors(colorset, colorsetsuccess, colorsetwarning, colorseterror); colorset = prefs->getInt("/theme/" + themeiconname + "/symbolicColor", colorset); sp_svg_write_color(colornamed, sizeof(colornamed), colorset); + colorsetsuccess = prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", colorsetsuccess); + sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess); + colorsetwarning = prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", colorsetwarning); + sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning); + colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", colorseterror); + sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror); _icon_pixbuf = iconinfo.load_symbolic(Gdk::RGBA(colornamed), Gdk::RGBA(colornamedsuccess), Gdk::RGBA(colornamedwarning), Gdk::RGBA(colornamederror), was_symbolic); |