Commit e14bcc57 authored by Jabier Arraiza's avatar Jabier Arraiza

Fix compiling issues

parent e8672ace
Pipeline #66651424 failed with stages
in 123 minutes and 48 seconds
......@@ -66,18 +66,18 @@
* ::::::: Color based
* ::::::: apply to colors
* ::::::: scope widget and all his childs
* ".inversestyle" invert window colors
* ".invertstyle" invert window colors
* ".brightstyle" force bright colors no matter the UI is dark or bright
* ".darkstyle" same but dark
* ".defaultstyle" use default window color for child wigets inside a modified one
* :::::::: Icon Based.
* ".iconsymbolic" Force icon symbolic
* ".iconregular" Force colorful icons
* ".symbolic" Force icon symbolic
* ".regular" Force colorful icons
* :::::::: Combo box.
* "..combobright" Combo bright
*/
* {
image {
-gtk-icon-palette: default;
}
......@@ -102,8 +102,8 @@
.bright .darkstyle *,
.dark .brightstyle,
.dark .brightstyle *,
.inversestyle,
.inversestyle * {
.invertstyle,
.invertstyle * {
color: @theme_bg_color;
background-color: @theme_fg_color;
background-image: image(@theme_fg_color);
......
......@@ -445,7 +445,7 @@ Application::add_gtk_css()
css_str += ";}";
css_str += ".dark .brightstyle image,";
css_str += ".bright .darkstyle image,";
css_str += ".inversestyle image";
css_str += ".invertstyle image";
css_str += "{color:";
css_str += colornamed_inverse;
css_str += ";}";
......
......@@ -109,7 +109,7 @@ public:
Inkscape::UI::Tools::ToolBase * active_event_context();
SPDocument * active_document();
SPDesktop * active_desktop();
Glib::RefPtr< Gtk::StyleProvider > colorizeprovider;
Glib::RefPtr< Gtk::CssProvider > colorizeprovider;
// Use this function to get selection model etc for a document
Inkscape::ActionContext action_context_for_document(SPDocument *doc);
Inkscape::ActionContext active_action_context();
......
......@@ -630,7 +630,7 @@ void InkscapePreferences::symbolicThemeCheck()
void InkscapePreferences::symbolicDefaultColor(){
auto const screen = Gdk::Screen::get_default();
Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
prefs->setBool("/theme/symbolicIconsDefaultColor", true);
}
......@@ -638,11 +638,12 @@ void InkscapePreferences::symbolicDefaultColor(){
void InkscapePreferences::symbolicStyling()
{
auto const screen = Gdk::Screen::get_default();
Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
using namespace Inkscape::IO::Resource;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
prefs->setBool("/theme/symbolicIconsDefaultColor", false);
Gtk::Window *window = SP_ACTIVE_DESKTOP->getToplevel();
Gtk::CssProvider::create();
Glib::ustring css_str = "";
if (prefs->getBool("/theme/symbolicIcons", false)) {
gchar colornamed[64];
......@@ -675,7 +676,7 @@ void InkscapePreferences::symbolicStyling()
css_str += ";}";
css_str += ".dark .brightstyle image,";
css_str += ".bright .darkstyle image,";
css_str += ".inversestyle image";
css_str += ".invertstyle image";
css_str += "{color:";
css_str += colornamed_inverse;
css_str += ";}";
......
......@@ -65,7 +65,7 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
if (iconinfo && SP_ACTIVE_DESKTOP->getToplevel()) {
bool was_symbolic = false;
Glib::RefPtr< Gtk::StyleContext > stylecontext = SP_ACTIVE_DESKTOP->getToplevel()->get_style_context();
stylecontext->add_provider(INKSCAPE.colorizeprovider, 1);
stylecontext->add_provider(INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
_icon_pixbuf = iconinfo.load_symbolic(stylecontext, was_symbolic);
} else {
Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);
......
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