From 750166c03c882fc7ef6ac45fdea32d34789ff1a4 Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Thu, 21 Mar 2019 23:48:35 +0100 Subject: Realign labels in "Fill and Stroke" dialog --- src/widgets/spw-utilities.cpp | 84 +++++++++++++++++++++---------------------- src/widgets/stroke-style.cpp | 11 +++--- src/widgets/stroke-style.h | 2 +- 3 files changed, 46 insertions(+), 51 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp index f0fd21c2b..aac323cf6 100644 --- a/src/widgets/spw-utilities.cpp +++ b/src/widgets/spw-utilities.cpp @@ -30,28 +30,24 @@ Gtk::Label * spw_label(Gtk::Grid *table, const gchar *label_text, int col, int r { Gtk::Label *label_widget = new Gtk::Label(); g_assert(label_widget != nullptr); - if (target != nullptr) - { + if (target != nullptr) { label_widget->set_text_with_mnemonic(label_text); - label_widget->set_mnemonic_widget(*target); - } - else - { + label_widget->set_mnemonic_widget(*target); + } else { label_widget->set_text(label_text); } label_widget->show(); - label_widget->set_hexpand(); - label_widget->set_halign(Gtk::ALIGN_FILL); + label_widget->set_halign(Gtk::ALIGN_START); label_widget->set_valign(Gtk::ALIGN_CENTER); - #if GTK_CHECK_VERSION(3,12,0) +#if GTK_CHECK_VERSION(3,12,0) label_widget->set_margin_start(4); label_widget->set_margin_end(4); - #else +#else label_widget->set_margin_left(4); label_widget->set_margin_right(4); - #endif +#endif table->attach(*label_widget, col, row, 1, 1); @@ -79,7 +75,7 @@ Gtk::HBox * spw_hbox(Gtk::Grid * table, int width, int col, int row) static void sp_set_font_size_recursive (GtkWidget *w, gpointer font) { - guint size = GPOINTER_TO_UINT (font); + guint size = GPOINTER_TO_UINT (font); auto css_provider = gtk_css_provider_new(); @@ -98,9 +94,9 @@ sp_set_font_size_recursive (GtkWidget *w, gpointer font) GTK_STYLE_PROVIDER(css_provider), GTK_STYLE_PROVIDER_PRIORITY_USER); - if (GTK_IS_CONTAINER(w)) { - gtk_container_foreach (GTK_CONTAINER(w), (GtkCallback) sp_set_font_size_recursive, font); - } + if (GTK_IS_CONTAINER(w)) { + gtk_container_foreach (GTK_CONTAINER(w), (GtkCallback) sp_set_font_size_recursive, font); + } g_object_unref(css_provider); } @@ -108,16 +104,16 @@ sp_set_font_size_recursive (GtkWidget *w, gpointer font) void sp_set_font_size (GtkWidget *w, guint font) { - sp_set_font_size_recursive (w, GUINT_TO_POINTER(font)); + sp_set_font_size_recursive (w, GUINT_TO_POINTER(font)); } void sp_set_font_size_smaller (GtkWidget *w) { - PangoContext *pc = gtk_widget_get_pango_context (w); - PangoFontDescription* pfd = pango_context_get_font_description (pc); - guint size = pango_font_description_get_size (pfd); - sp_set_font_size_recursive (w, GUINT_TO_POINTER((int) (0.8*size))); + PangoContext *pc = gtk_widget_get_pango_context (w); + PangoFontDescription* pfd = pango_context_get_font_description (pc); + guint size = pango_font_description_get_size (pfd); + sp_set_font_size_recursive (w, GUINT_TO_POINTER((int) (0.8*size))); } /** @@ -125,22 +121,22 @@ sp_set_font_size_smaller (GtkWidget *w) */ gpointer sp_search_by_data_recursive(GtkWidget *w, gpointer key) { - gpointer r = nullptr; + gpointer r = nullptr; - if (w && G_IS_OBJECT(w)) { - r = g_object_get_data(G_OBJECT(w), (gchar *) key); - } - if (r) return r; + if (w && G_IS_OBJECT(w)) { + r = g_object_get_data(G_OBJECT(w), (gchar *) key); + } + if (r) return r; - if (GTK_IS_CONTAINER(w)) { + if (GTK_IS_CONTAINER(w)) { std::vector children = Glib::wrap(GTK_CONTAINER(w))->get_children(); - for (auto i:children) { - r = sp_search_by_data_recursive(GTK_WIDGET(i->gobj()), key); - if (r) return r; - } - } + for (auto i:children) { + r = sp_search_by_data_recursive(GTK_WIDGET(i->gobj()), key); + if (r) return r; + } + } - return nullptr; + return nullptr; } /** @@ -184,22 +180,22 @@ sp_search_by_name_recursive(Gtk::Widget *parent, const Glib::ustring& name) */ GtkWidget *sp_search_by_value_recursive(GtkWidget *w, gchar *key, gchar *value) { - gchar *r = nullptr; + gchar *r = nullptr; - if (w && G_IS_OBJECT(w)) { - r = (gchar *) g_object_get_data(G_OBJECT(w), key); - } - if (r && !strcmp (r, value)) return w; + if (w && G_IS_OBJECT(w)) { + r = (gchar *) g_object_get_data(G_OBJECT(w), key); + } + if (r && !strcmp (r, value)) return w; - if (GTK_IS_CONTAINER(w)) { + if (GTK_IS_CONTAINER(w)) { std::vector children = Glib::wrap(GTK_CONTAINER(w))->get_children(); - for (auto i:children) { - GtkWidget *child = sp_search_by_value_recursive(GTK_WIDGET(i->gobj()), key, value); - if (child) return child; - } - } + for (auto i:children) { + GtkWidget *child = sp_search_by_value_recursive(GTK_WIDGET(i->gobj()), key, value); + if (child) return child; + } + } - return nullptr; + return nullptr; } /* diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 7dee458f4..46454d508 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -140,7 +140,7 @@ Gtk::Widget *Inkscape::Widgets::createStrokeStyleWidget( ) } StrokeStyle::StrokeStyle() : - Gtk::VBox(), + Gtk::Box(), miterLimitSpin(), widthSpin(), unitSelector(), @@ -160,16 +160,15 @@ StrokeStyle::StrokeStyle() : endMarkerConn(), _old_unit(nullptr) { - Gtk::HBox *hb; - Gtk::HBox *f = new Gtk::HBox(false, 0); - f->show(); - add(*f); table = new Gtk::Grid(); table->set_border_width(4); table->set_row_spacing(4); + table->set_hexpand(false); + table->set_halign(Gtk::ALIGN_CENTER); table->show(); - f->add(*table); + add(*table); + Gtk::HBox *hb; gint i = 0; //spw_label(t, C_("Stroke width", "_Width:"), 0, i); diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h index 7d06a5173..dd8cf07dc 100644 --- a/src/widgets/stroke-style.h +++ b/src/widgets/stroke-style.h @@ -102,7 +102,7 @@ SPObject *getMarkerObj(gchar const *n, SPDocument *doc); namespace Inkscape { class StrokeStyleButton; -class StrokeStyle : public Gtk::VBox +class StrokeStyle : public Gtk::Box { public: StrokeStyle(); -- cgit v1.2.3