diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-26 19:55:22 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-26 19:55:22 +0000 |
| commit | 61a033d08452b31a19ab166b1a1bfe1c05cd1f58 (patch) | |
| tree | 14412187a4ab47eb37ed792e177f163a505aeba7 /src/inkscape.cpp | |
| parent | RectToolbar: GtkAction migration (first pass) (diff) | |
| parent | Add 'Theme Decide' option to symbolic icons color (diff) | |
| download | inkscape-61a033d08452b31a19ab166b1a1bfe1c05cd1f58.tar.gz inkscape-61a033d08452b31a19ab166b1a1bfe1c05cd1f58.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/inkscape.cpp')
| -rw-r--r-- | src/inkscape.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index c63bc854c..1418f5c3b 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -386,14 +386,21 @@ Application::add_gtk_css() int colorset_inverse = colorset ^ 0xffffff00; gchar colornamed_inverse[64]; sp_svg_write_color(colornamed_inverse, sizeof(colornamed_inverse), colorset_inverse); - css_str += "*{ -gtk-icon-style: symbolic;}"; - css_str += "image{ color:"; - css_str += colornamed; - css_str += ";}"; - css_str += "#iconinverse{ color:"; - css_str += colornamed_inverse; - css_str += ";}"; - css_str += "#iconregular{ -gtk-icon-style: regular;}"; + if (prefs->getBool("/theme/symbolicIconsDefaultColor", true)) { + css_str += "*{ -gtk-icon-style: symbolic;}"; + css_str += "image{ color: @theme_fg_color}"; + css_str += "iconinverse{ color: @theme_bg_color;}"; + css_str += "iconregular{ -gtk-icon-style: regular;}"; + } else { + css_str += "*{ -gtk-icon-style: symbolic;}"; + css_str += "image{ color:"; + css_str += colornamed; + css_str += ";}"; + css_str += "#iconinverse{ color:"; + css_str += colornamed_inverse; + css_str += ";}"; + css_str += "#iconregular{ -gtk-icon-style: regular;}"; + } } else { css_str += "*{-gtk-icon-style: regular;}"; } |