Changeset 22096 for branches/swt/src/user32/button.cpp

Timestamp:

May 14, 2015, 9:55:41 PM (11 years ago)

Author:

rousseau

Message:

Cleanup button text alignment fix

File:

• branches/swt/src/user32/button.cpp (modified) (2 diffs)

branches/swt/src/user32/button.cpp

@@ -776 +776 @@
   INT format = 0;
 
-  if (dwStyle & BS_LEFT) format = DT_LEFT;
-  else if (dwStyle & BS_CENTER) format = DT_CENTER;
-  else if ((dwStyle & BS_RIGHT) || (dwExStyle & WS_EX_RIGHT)) format = DT_RIGHT;
-  else format = defHorz;
-
-/*
-  if (dwStyle & BS_TOP) format |= DT_TOP;
-  else if (dwStyle & BS_VCENTER) format |= DT_VCENTER;
-  else if (dwStyle & BS_BOTTOM) format |= DT_BOTTOM;
-  else format |= defVert;
-*/
-
   /*
    * BS_CENTER is not a single bit-flag, but is actually BS_LEFT | BS_RIGHT.
@@ -797 +785 @@
   else if (((dwStyle & BS_RIGHT) == BS_RIGHT) || ((dwExStyle & WS_EX_RIGHT) == BS_RIGHT)) format = DT_RIGHT;
   else format = defHorz;
+
+  if (dwStyle & BS_TOP) format |= DT_TOP;
+  else if (dwStyle & BS_VCENTER) format |= DT_VCENTER;
+  else if (dwStyle & BS_BOTTOM) format |= DT_BOTTOM;
+  else format |= defVert;
+
   if (!(dwStyle & BS_MULTILINE)) format |= DT_SINGLELINE;