summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2018-09-14 19:18:15 +0000
committerJabiertxof <jabier.arraiza@marker.es>2018-09-14 19:18:15 +0000
commitc2d9a5f2a548f8c37bfd1aa24230a8654fadba9b (patch)
treeadecbb6c99958d2a1992bd1020e3fecdeb967547 /src/live_effects/parameter
parentUpdate info widget inmeasure segments (diff)
downloadinkscape-c2d9a5f2a548f8c37bfd1aa24230a8654fadba9b.tar.gz
inkscape-c2d9a5f2a548f8c37bfd1aa24230a8654fadba9b.zip
Update measure segments helper info and align to messages LPE parameter
Diffstat (limited to 'src/live_effects/parameter')
-rw-r--r--src/live_effects/parameter/message.cpp30
-rw-r--r--src/live_effects/parameter/message.h14
2 files changed, 30 insertions, 14 deletions
diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp
index a6e919558..da781a803 100644
--- a/src/live_effects/parameter/message.cpp
+++ b/src/live_effects/parameter/message.cpp
@@ -15,10 +15,15 @@ namespace LivePathEffect {
MessageParam::MessageParam( const Glib::ustring& label, const Glib::ustring& tip,
const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
- Effect* effect, const gchar * default_message )
+ Effect* effect, const gchar * default_message, Gtk::Align halign,
+ Gtk::Align valign, double marginstart, double marginend)
: Parameter(label, tip, key, wr, effect),
message(default_message),
- defmessage(default_message)
+ defmessage(default_message),
+ _halign(halign),
+ _valign(valign),
+ _marginstart(marginstart),
+ _marginend(marginend)
{
_label = nullptr;
_min_height = -1;
@@ -72,28 +77,27 @@ MessageParam::param_newWidget()
Gtk::Widget * widg_frame = frame->get_label_widget();
#if GTKMM_CHECK_VERSION(3,12,0)
- widg_frame->set_margin_end(5);
- widg_frame->set_margin_start(5);
+ widg_frame->set_margin_end(_marginend);
+ widg_frame->set_margin_start(_marginstart);
#else
- widg_frame->set_margin_right(5);
- widg_frame->set_margin_left(5);
+ widg_frame->set_margin_right(_marginend);
+ widg_frame->set_margin_left(_marginstart);
#endif
-
_label = new Gtk::Label (message, Gtk::ALIGN_END);
_label->set_use_underline (true);
_label->set_use_markup();
_label->set_line_wrap(true);
_label->set_size_request(-1, _min_height);
Gtk::Widget* widg_label = dynamic_cast<Gtk::Widget *> (_label);
- widg_label->set_margin_top(8);
- widg_label->set_margin_bottom(10);
+ widg_label->set_halign(_halign);
+ widg_label->set_valign(_valign);
#if GTKMM_CHECK_VERSION(3,12,0)
- widg_label->set_margin_end(6);
- widg_label->set_margin_start(6);
+ widg_label->set_margin_end(_marginend);
+ widg_label->set_margin_start(_marginstart);
#else
- widg_label->set_margin_right(6);
- widg_label->set_margin_left(6);
+ widg_label->set_margin_right(_marginstart);
+ widg_label->set_margin_left(_marginstart);
#endif
frame->add(*widg_label);
diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h
index 3d9ddf62b..fad60533f 100644
--- a/src/live_effects/parameter/message.h
+++ b/src/live_effects/parameter/message.h
@@ -21,7 +21,11 @@ public:
const Glib::ustring& key,
Inkscape::UI::Widget::Registry* wr,
Effect* effect,
- const gchar * default_message = "Default message");
+ const gchar * default_message = "Default message",
+ Gtk::Align halign = Gtk::ALIGN_END,
+ Gtk::Align valign = Gtk::ALIGN_CENTER,
+ double marginstart = 6,
+ double marginend = 6);
~MessageParam() override = default;
Gtk::Widget * param_newWidget() override;
@@ -43,6 +47,14 @@ private:
MessageParam& operator=(const MessageParam&) = delete;
const gchar * message;
const gchar * defmessage;
+ Gtk::Align _halign;
+ Gtk::Align _valign;
+ double _marginstart;
+ double _marginend;
+ double _marginleft;
+ double _marginright;
+
+
};
} //namespace LivePathEffect