diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-03-21 22:48:35 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-03-22 17:37:54 +0000 |
| commit | 750166c03c882fc7ef6ac45fdea32d34789ff1a4 (patch) | |
| tree | b3c8a8c307ee2a3c445f079c667a77b468adb76c /src/ui | |
| parent | Document Properties: General UI cleanup (diff) | |
| download | inkscape-750166c03c882fc7ef6ac45fdea32d34789ff1a4.tar.gz inkscape-750166c03c882fc7ef6ac45fdea32d34789ff1a4.zip | |
Realign labels in "Fill and Stroke" dialog
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/document-properties.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/fill-and-stroke.cpp | 5 | ||||
| -rw-r--r-- | src/ui/widget/color-scales.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/dash-selector.cpp | 6 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 622334b97..6e3878164 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -781,7 +781,7 @@ void DocumentProperties::build_scripting() { _page_scripting->show(); - _page_scripting->table().attach(_scripting_notebook, 0, 0); + _page_scripting->table().attach(_scripting_notebook, 0, 0, 1, 1); _scripting_notebook.append_page(*_page_external_scripts, _("External scripts")); _scripting_notebook.append_page(*_page_embedded_scripts, _("Embedded scripts")); diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp index 67de34731..5cc7c48e6 100644 --- a/src/ui/dialog/fill-and-stroke.cpp +++ b/src/ui/dialog/fill-and-stroke.cpp @@ -141,9 +141,10 @@ FillAndStroke::_layoutPageStrokePaint() void FillAndStroke::_layoutPageStrokeStyle() { - //Gtk::Widget *strokeStyleWdgt = manage(Glib::wrap(sp_stroke_style_line_widget_new())); - //Gtk::Widget *strokeStyleWdgt = static_cast<Gtk::Widget *>(sp_stroke_style_line_widget_new()); strokeStyleWdgt = sp_stroke_style_line_widget_new(); + strokeStyleWdgt->set_hexpand(); + strokeStyleWdgt->set_halign(Gtk::ALIGN_CENTER); + _page_stroke_style->table().attach(*strokeStyleWdgt, 0, 0, 1, 1); } diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 1229801d1..588e9a84d 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -91,7 +91,7 @@ void ColorScales::_initUI(SPColorScalesMode mode) /* Label */ _l[i] = gtk_label_new(""); - gtk_widget_set_halign(_l[i], GTK_ALIGN_END); + gtk_widget_set_halign(_l[i], GTK_ALIGN_START); gtk_widget_show(_l[i]); #if GTK_CHECK_VERSION(3, 12, 0) @@ -138,7 +138,7 @@ void ColorScales::_initUI(SPColorScalesMode mode) #endif gtk_widget_set_margin_top(_b[i], YPAD); gtk_widget_set_margin_bottom(_b[i], YPAD); - gtk_widget_set_halign(_b[i], GTK_ALIGN_CENTER); + gtk_widget_set_halign(_b[i], GTK_ALIGN_END); gtk_widget_set_valign(_b[i], GTK_ALIGN_CENTER); gtk_grid_attach(GTK_GRID(t), _b[i], 2, i, 1, 1); diff --git a/src/ui/widget/dash-selector.cpp b/src/ui/widget/dash-selector.cpp index ea5cc57d2..897b964e4 100644 --- a/src/ui/widget/dash-selector.cpp +++ b/src/ui/widget/dash-selector.cpp @@ -53,6 +53,8 @@ DashSelector::DashSelector() preview_height(16), preview_lineheight(2) { + set_spacing(4); + // TODO: find something more sensible here!! init_dashes(); @@ -65,7 +67,8 @@ DashSelector::DashSelector() dash_combo.show(); dash_combo.signal_changed().connect( sigc::mem_fun(*this, &DashSelector::on_selection) ); - this->pack_start(dash_combo, false, false, 0); + this->pack_start(dash_combo, true, true, 0); + offset = Gtk::Adjustment::create(0.0, 0.0, 10.0, 0.1, 1.0, 0.0); offset->signal_value_changed().connect(sigc::mem_fun(*this, &DashSelector::offset_value_changed)); auto sb = new Inkscape::UI::Widget::SpinButton(offset, 0.1, 2); @@ -75,7 +78,6 @@ DashSelector::DashSelector() this->pack_start(*sb, false, false, 0); - int np=0; while (dashes[np]){ np++;} for (int i = 0; i<np-1; i++) { // all but the custom one go this way |