From 8e1c696fd91a7d3d1740e6e76617a75068245057 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 4 Nov 2017 16:08:32 +0100 Subject: Fix meessage parameter to allow min height request --- src/live_effects/parameter/message.cpp | 24 ++++++++++++++++++------ src/live_effects/parameter/message.h | 4 +++- 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'src/live_effects/parameter') diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp index 39d8f12c7..28e94a900 100644 --- a/src/live_effects/parameter/message.cpp +++ b/src/live_effects/parameter/message.cpp @@ -20,7 +20,8 @@ MessageParam::MessageParam( const Glib::ustring& label, const Glib::ustring& tip message(g_strdup(default_message)), defmessage(g_strdup(default_message)) { - + _label = NULL; + _min_min_height = -1; } void @@ -54,6 +55,16 @@ MessageParam::param_getDefaultSVGValue() const return defmessage; } +void +MessageParam::param_set_min_height(int height) +{ + _min_height = height; + if (_label) { + _label->set_size_request(-1, _min_height); + } +} + + Gtk::Widget * MessageParam::param_newWidget() { @@ -61,11 +72,12 @@ MessageParam::param_newWidget() Gtk::Widget * widg_frame = frame->get_label_widget(); widg_frame->set_margin_right(5); widg_frame->set_margin_left(5); - Gtk::Label * label = new Gtk::Label (message, Gtk::ALIGN_END); - label->set_use_underline (true); - label->set_use_markup(); - label->set_line_wrap(true); - Gtk::Widget * widg_label = dynamic_cast (label); + _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 (_label); widg_label->set_margin_top(8); widg_label->set_margin_bottom(10); widg_label->set_margin_right(6); diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h index 63075cf96..2ac2c791a 100644 --- a/src/live_effects/parameter/message.h +++ b/src/live_effects/parameter/message.h @@ -33,10 +33,12 @@ public: void param_setValue(const gchar * message); virtual void param_set_default(); - + void param_set_min_height(int height); const gchar * get_value() const { return message; }; private: + Gtk::Label * _label; + int _min_height; MessageParam(const MessageParam&); MessageParam& operator=(const MessageParam&); gchar * message; -- cgit v1.2.3