diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-21 22:19:53 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-21 22:19:53 +0000 |
| commit | 34d08da015358e09229ebd7f01744432901bdc47 (patch) | |
| tree | 5766107cc843557a0fab0c9bda889311ba41d9fc /src/helper | |
| parent | Fixing some icons dont redraw (diff) | |
| download | inkscape-34d08da015358e09229ebd7f01744432901bdc47.tar.gz inkscape-34d08da015358e09229ebd7f01744432901bdc47.zip | |
Fixing coding style
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/icon-loader.cpp | 25 | ||||
| -rw-r--r-- | src/helper/icon-loader.h | 8 |
2 files changed, 17 insertions, 16 deletions
diff --git a/src/helper/icon-loader.cpp b/src/helper/icon-loader.cpp index 3a7d459b3..e514343a3 100644 --- a/src/helper/icon-loader.cpp +++ b/src/helper/icon-loader.cpp @@ -45,13 +45,11 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) if (icon_name == "gtk-preferences") { icon_name = "preferences-system"; } - sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", - 0x000000ff)); - Gdk::RGBA color; - color.set(colornamed); + sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", 0x000000ff)); + Gdk::RGBA color; + color.set(colornamed); Gtk::IconInfo iconinfo = - iconTheme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, - Gtk::ICON_LOOKUP_FORCE_SIZE); + iconTheme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE); if (bool(iconinfo)) { // TODO: view if we need parametrice other colors bool was_symbolic = false; @@ -123,20 +121,21 @@ Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_size) return image; } -std::pair<Glib::RefPtr<Gtk::RadioAction>, Gdk::RGBA > sp_set_radioaction_icon(Gtk::RadioAction::Group group, Glib::ustring icon_name, Glib::ustring label, Glib::ustring tooltip) +std::pair<Glib::RefPtr<Gtk::RadioAction>, Gdk::RGBA> sp_set_radioaction_icon(Gtk::RadioAction::Group group, + Glib::ustring icon_name, + Glib::ustring label, Glib::ustring tooltip) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); if (prefs->getBool("/theme/symbolicIcons", false)) { icon_name = icon_name + Glib::ustring("-symbolic"); } - + Glib::RefPtr<Gtk::RadioAction> action = - Gtk::RadioAction::create_with_icon_name (group, "Anonymous", icon_name.c_str(), label.c_str(), tooltip.c_str()); - Gtk::ToolItem* item = action->create_tool_item(); - Gdk::RGBA color; + Gtk::RadioAction::create_with_icon_name(group, "Anonymous", icon_name.c_str(), label.c_str(), tooltip.c_str()); + Gtk::ToolItem *item = action->create_tool_item(); + Gdk::RGBA color; gchar colornamed[64]; - sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", - 0x000000ff)); + sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", 0x000000ff)); color.set(colornamed); return std::make_pair(action, color); } diff --git a/src/helper/icon-loader.h b/src/helper/icon-loader.h index ef7dbd110..02b748163 100644 --- a/src/helper/icon-loader.h +++ b/src/helper/icon-loader.h @@ -11,9 +11,8 @@ * */ #include <gdkmm/pixbuf.h> -#include <gtkmm/image.h> #include <gtkmm/box.h> -#include <gtkmm/radioaction.h> +#include <gtkmm/image.h> #include <gtkmm/radioaction.h> Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size); @@ -24,5 +23,8 @@ Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gint size); Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_sice); Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, GtkIconSize icon_sice); Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_sice); -std::pair<Glib::RefPtr<Gtk::RadioAction>,Gdk::RGBA > sp_set_radioaction_icon(Gtk::RadioAction::Group group, Glib::ustring icon_name, Glib::ustring label, Glib::ustring tooltip); +std::pair<Glib::RefPtr<Gtk::RadioAction>, Gdk::RGBA> sp_set_radioaction_icon(Gtk::RadioAction::Group group, + Glib::ustring icon_name, + Glib::ustring label, + Glib::ustring tooltip); #endif // SEEN_INK_STOCK_ITEMS_H |