summaryrefslogtreecommitdiff
path: root/fluid/Fl_Widget_Type.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2010-04-09 22:18:05 +0000
committerMatthias Melcher <fltk@matthiasm.com>2010-04-09 22:18:05 +0000
commit927fd351655320ed90ceecedaf9ea58656594650 (patch)
treea9698d39716b54a81c88e5e2aa10656c062501ae /fluid/Fl_Widget_Type.cxx
parent08e71113e9b071be540c0ecb03287e647c0bc0c5 (diff)
Added new label alignments for image and text to Fluid.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7476 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/Fl_Widget_Type.cxx')
-rw-r--r--fluid/Fl_Widget_Type.cxx31
1 files changed, 31 insertions, 0 deletions
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index dc6215dec..0fde0a682 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1170,6 +1170,37 @@ void align_cb(Fl_Button* i, void *v) {
}
}
+void align_text_image_cb(Fl_Menu_Button* i, void *v) {
+ if (v == LOAD) {
+ if (current_widget->is_menu_item()) {i->deactivate(); return;} else i->activate();
+ Fl_Menu_Item *mi = (Fl_Menu_Item*)i->menu();
+ Fl_Align b = current_widget->o->align() & FL_ALIGN_IMAGE_MASK;
+ for (;mi->text;mi++) {
+ if (mi->argument()==b)
+ mi->set();
+ else
+ mi->clear();
+ }
+ } else {
+ const Fl_Menu_Item *mi = i->mvalue();
+ Fl_Align b = Fl_Align(long(mi->user_data()));
+ int mod = 0;
+ for (Fl_Type *o = Fl_Type::first; o; o = o->next) {
+ if (o->selected && o->is_widget()) {
+ Fl_Widget_Type* q = (Fl_Widget_Type*)o;
+ Fl_Align x = q->o->align();
+ Fl_Align y = (x & ~FL_ALIGN_IMAGE_MASK) | b;
+ if (x != y) {
+ q->o->align(y);
+ q->redraw();
+ mod = 1;
+ }
+ }
+ }
+ if (mod) set_modflag(1);
+ }
+}
+
////////////////////////////////////////////////////////////////
void callback_cb(CodeEditor* i, void *v) {