From 927fd351655320ed90ceecedaf9ea58656594650 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Fri, 9 Apr 2010 22:18:05 +0000
Subject: 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
---
 src/Fl_Button.cxx | 1 +
 src/fl_draw.cxx   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx
index be41a01a4..23b974039 100644
--- a/src/Fl_Button.cxx
+++ b/src/Fl_Button.cxx
@@ -72,6 +72,7 @@ void Fl_Button::draw() {
   if (type() == FL_HIDDEN_BUTTON) return;
   Fl_Color col = value() ? selection_color() : color();
   draw_box(value() ? (down_box()?down_box():fl_down(box())) : box(), col);
+  draw_backdrop();
   if (labeltype() == FL_NORMAL_LABEL && value()) {
     Fl_Color c = labelcolor();
     labelcolor(fl_contrast(c, col));
diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx
index 27f50afad..0517ab747 100644
--- a/src/fl_draw.cxx
+++ b/src/fl_draw.cxx
@@ -253,7 +253,7 @@ void fl_draw(
   int xpos;
   int ypos;
   int height = fl_height();
-  int imgvert = ((align&FL_ALIGN_TEXT_NEXT_TO_IMAGE)==0);
+  int imgvert = ((align&FL_ALIGN_IMAGE_NEXT_TO_TEXT)==0);
   int imgh = img && imgvert ? img->h() : 0;
   int imgw[2] = {0, 0};
 
-- 
cgit v1.2.3