From 0a4ab9a3f12609a955cd02ea4b22aa901fdd1eb1 Mon Sep 17 00:00:00 2001 From: Karl Cheng Date: Mon, 10 Jun 2019 18:24:48 +1000 Subject: Remove deprecated usage of custom Gtk::IconSize Custom Gtk::IconSize values have been deprecated since GTK 3.10. Also fix incorrect usage of pixel values to the Gtk::IconSize() constructor (introduced in de13793763), these are in fact meant to be enum values. Refs: https://gitlab.com/inkscape/inkscape/commit/de137937630524727b287fb2e03ec470554683a8 --- src/ui/dialog/livepatheffect-add.cpp | 15 ++++++++------- src/ui/dialog/symbols.cpp | 37 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp index a31f71a8c..39b6f7d52 100644 --- a/src/ui/dialog/livepatheffect-add.cpp +++ b/src/ui/dialog/livepatheffect-add.cpp @@ -141,7 +141,7 @@ LivePathEffectAdd::LivePathEffectAdd() LPEExperimentalToggle->set_active(active); Gtk::Image *LPEIcon; builder_effect->get_widget("LPEIcon", LPEIcon); - LPEIcon->set_from_icon_name(converter.get_icon(data->id), Gtk::BuiltinIconSize(Gtk::ICON_SIZE_DIALOG)); + LPEIcon->set_from_icon_name(converter.get_icon(data->id), Gtk::IconSize(Gtk::ICON_SIZE_DIALOG)); Gtk::EventBox *LPESelectorEffectEventInfo; builder_effect->get_widget("LPESelectorEffectEventInfo", LPESelectorEffectEventInfo); LPESelectorEffectEventInfo->signal_enter_notify_event().connect(sigc::bind>( @@ -150,7 +150,7 @@ LivePathEffectAdd::LivePathEffectAdd() builder_effect->get_widget("LPESelectorEffectEventFav", LPESelectorEffectEventFav); if (sp_has_fav(LPEName->get_text())) { Gtk::Image *fav = dynamic_cast(LPESelectorEffectEventFav->get_child()); - fav->set_from_icon_name("draw-star", Gtk::IconSize(25)); + fav->set_from_icon_name("draw-star", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR)); } Gtk::EventBox *LPESelectorEffectEventFavTop; builder_effect->get_widget("LPESelectorEffectEventFavTop", LPESelectorEffectEventFavTop); @@ -271,7 +271,7 @@ bool LivePathEffectAdd::pop_description(GdkEventCrossing *evt, Glib::RefPtrget_widget("LPESelectorEffectInfoIcon", LPESelectorEffectInfoIcon); - LPESelectorEffectInfoIcon->set_from_icon_name(LPEIcon->get_icon_name(), Gtk::IconSize(60)); + LPESelectorEffectInfoIcon->set_from_icon_name(LPEIcon->get_icon_name(), Gtk::IconSize(Gtk::ICON_SIZE_DIALOG)); Gtk::Label *LPESelectorEffectInfoName; _builder->get_widget("LPESelectorEffectInfoName", LPESelectorEffectInfoName); @@ -306,7 +306,7 @@ bool LivePathEffectAdd::fav_toggler(GdkEventButton *evt, Glib::RefPtrget_text())) { LPESelectorEffectEventFavTop->set_visible(false); LPESelectorEffectEventFavTop->hide(); - LPESelectorEffectFav->set_from_icon_name("draw-star-outline", Gtk::IconSize(25)); + LPESelectorEffectFav->set_from_icon_name("draw-star-outline", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR)); sp_remove_fav(LPEName->get_text()); LPESelectorEffect->get_parent()->get_style_context()->remove_class("lpefav"); LPESelectorEffect->get_parent()->get_style_context()->add_class("lpenormal"); @@ -317,7 +317,7 @@ bool LivePathEffectAdd::fav_toggler(GdkEventButton *evt, Glib::RefPtrset_visible(true); LPESelectorEffectEventFavTop->show(); - LPESelectorEffectFav->set_from_icon_name("draw-star", Gtk::IconSize(25)); + LPESelectorEffectFav->set_from_icon_name("draw-star", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR)); sp_add_fav(LPEName->get_text()); LPESelectorEffect->get_parent()->get_style_context()->add_class("lpefav"); LPESelectorEffect->get_parent()->get_style_context()->remove_class("lpenormal"); @@ -333,14 +333,15 @@ bool LivePathEffectAdd::show_fav_toggler(GdkEventButton *evt) Gtk::Image *favimage = dynamic_cast(_LPESelectorEffectEventFavShow->get_child()); if (favimage) { if (_showfavs) { - favimage->set_from_icon_name("draw-star", Gtk::IconSize(favimage->get_pixel_size())); + favimage->set_from_icon_name("draw-star", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR)); } else { - favimage->set_from_icon_name("draw-star-outline", Gtk::IconSize(favimage->get_pixel_size())); + favimage->set_from_icon_name("draw-star-outline", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR)); } } reload_effect_list(); return true; } + bool LivePathEffectAdd::apply(GdkEventButton *evt, Glib::RefPtr builder_effect, const LivePathEffect::EnumEffectData *to_add) { diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index d4b48258d..ec190ef29 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -202,37 +202,38 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : overlay->get_style_context()->add_class("colorbright"); overlay->get_style_context()->add_class("backgroundbright"); scroller->set_size_request(100, 250); - table->attach(*Gtk::manage(overlay),0,row,2,1); + table->attach(*Gtk::manage(overlay), 0, row, 2, 1); /*************************Overlays******************************/ overlay_opacity = new Gtk::Image(); - overlay_opacity->set_halign(Gtk::ALIGN_START ); - overlay_opacity->set_valign(Gtk::ALIGN_START ); - //No results - iconsize = Gtk::IconSize().from_name(Glib::ustring("ICON_SIZE_DIALOG_EXTRA")); - if (!iconsize) { - iconsize = Gtk::IconSize().register_new(Glib::ustring("ICON_SIZE_DIALOG_EXTRA"), 110, 110); - } - overlay_icon = sp_get_icon_image("searching", iconsize); + overlay_opacity->set_halign(Gtk::ALIGN_START); + overlay_opacity->set_valign(Gtk::ALIGN_START); + + // No results + overlay_icon = sp_get_icon_image("searching", Gtk::ICON_SIZE_DIALOG); + overlay_icon->set_pixel_size(110); overlay_icon->get_style_context()->add_class("iconsymbolic"); - overlay_icon->set_halign(Gtk::ALIGN_CENTER ); - overlay_icon->set_valign(Gtk::ALIGN_START ); + overlay_icon->set_halign(Gtk::ALIGN_CENTER); + overlay_icon->set_valign(Gtk::ALIGN_START); overlay_icon->set_margin_top(45); + overlay_title = new Gtk::Label(); overlay_title->set_halign(Gtk::ALIGN_CENTER ); overlay_title->set_valign(Gtk::ALIGN_START ); overlay_title->set_justify(Gtk::JUSTIFY_CENTER); overlay_title->set_margin_top(155); + overlay_desc = new Gtk::Label(); - overlay_desc->set_halign(Gtk::ALIGN_CENTER ); - overlay_desc->set_valign(Gtk::ALIGN_START ); + overlay_desc->set_halign(Gtk::ALIGN_CENTER); + overlay_desc->set_valign(Gtk::ALIGN_START); overlay_desc->set_margin_top(180); overlay_desc->set_justify(Gtk::JUSTIFY_CENTER); - overlay->add_overlay(* overlay_opacity); - overlay->add_overlay(* overlay_icon); - overlay->add_overlay(* overlay_title); - overlay->add_overlay(* overlay_desc); - + + overlay->add_overlay(*overlay_opacity); + overlay->add_overlay(*overlay_icon); + overlay->add_overlay(*overlay_title); + overlay->add_overlay(*overlay_desc); + previous_height = 0; ++row; -- cgit v1.2.3