Commit 02864fd1 authored by Jabier Arraiza's avatar Jabier Arraiza

Fix a icon bug

parent caa1eca9
Pipeline #66691389 passed with stages
in 119 minutes and 44 seconds
......@@ -6,7 +6,7 @@
<style id="style226">
.success { fill:#4AD589; }
.warning { fill:#F57900; }
. { fill:#cc0000; }
.error { fill:#cc0000; }
</style>
<g transform="translate(-135,-807.36218)" inkscape:label="00069" id="dialog-align-and-distribute">
<path inkscape:connector-curvature="0" id="rect18735" d="m 135,807.36218 h 16 v 16 h -16 z" style="opacity:0;fill:none"/>
......
......@@ -385,7 +385,7 @@ Application::add_gtk_css()
prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName));
Glib::ustring gtkthemename = prefs->getString("/theme/gtkTheme");
if (gtkthemename != "") {
g_object_set(settings, "gtk-theme-name", gtkthemename.c_str(), NULL);
g_object_set(settings, "gtk-theme-name", gtkthemename.c_str(), NULL);
} else {
prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName));
}
......@@ -476,7 +476,7 @@ Application::add_gtk_css()
ex.what().c_str());
}
Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
}
}
/* \brief Constructor for the application.
......
......@@ -15,7 +15,6 @@
#include "inkscape.h"
#include "svg/svg-color.h"
#include "widgets/toolbox.h"
#include <gtkmm/iconinfo.h>
#include <gdkmm/display.h>
#include <gdkmm/screen.h>
#include <gtkmm/iconinfo.h>
......@@ -80,7 +79,9 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning);
int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0xcc0000ff);
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);
_icon_pixbuf =
iconinfo.load_symbolic(Gdk::RGBA(colornamed), Gdk::RGBA(colornamedsuccess),
Gdk::RGBA(colornamedwarning), Gdk::RGBA(colornamederror), was_symbolic);
} else {
Glib::RefPtr<Gtk::StyleContext> stylecontext = SP_ACTIVE_DESKTOP->getToplevel()->get_style_context();
_icon_pixbuf = iconinfo.load_symbolic(stylecontext, was_symbolic);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment