summaryrefslogtreecommitdiff
path: root/src/Fl_Message.cxx
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2022-02-16 14:48:23 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2022-02-16 14:50:50 +0100
commit1cdd669dc6176ad8233484686591b235947f22c1 (patch)
tree1d04db2003dc8356698f63cc9e5588052a2e325a /src/Fl_Message.cxx
parent390095392b51034f42e03534925f59802076b487 (diff)
Fix "fl_message_icon() regression" (#395)
Some attributes of the default message icon had not been copied to the new Fl_Message class when opening a new dialog. Clarify documentation about supported icon attributes.
Diffstat (limited to 'src/Fl_Message.cxx')
-rw-r--r--src/Fl_Message.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Fl_Message.cxx b/src/Fl_Message.cxx
index 970dde3f4..a6588f8b5 100644
--- a/src/Fl_Message.cxx
+++ b/src/Fl_Message.cxx
@@ -163,11 +163,15 @@ Fl_Message::Fl_Message(const char *iconlabel)
icon_->labelsize(icon_template->labelsize());
icon_->color(icon_template->color());
icon_->labelcolor(icon_template->labelcolor());
+ icon_->image(icon_template->image());
+ icon_->align(icon_template->align());
- if (message_icon_label_) { // fl_message_icon_label() has been called
+ if (message_icon_label_) { // fl_message_icon_label() has been called
icon_->copy_label(message_icon_label_);
message_icon_label_ = 0;
- } else { // use default (static, per message default string)
+ } else if (icon_template->label()) { // sticky icon template label() has been set
+ icon_->copy_label(icon_template->label());
+ } else { // default string (c'tor argument)
icon_->label(iconlabel);
}