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

Timestamp:

Mar 31, 2015, 5:56:55 PM (11 years ago)

Author:

rousseau

Message:

Fixed button text alignment

File:

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

branches/swt/src/user32/button.cpp

@@ -186 +186 @@
 {
   DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
-  //SvL: TODO: NT does something extra for ownerdrawn buttons; check this 
+  //SvL: TODO: NT does something extra for ownerdrawn buttons; check this
   if(style == BS_OWNERDRAW) {
         return DefWindowProcA(hwnd, WM_ERASEBKGND, wParam, lParam);
@@ -590 +590 @@
   if (wParam > maxCheckState[style]) wParam = maxCheckState[style];
 #ifndef __WIN32OS2__
-  //Must clear WS_TABSTOP of control that is already disabled or else 
-  //multiple control can have this style ((auto)radiobutton) and 
+  //Must clear WS_TABSTOP of control that is already disabled or else
+  //multiple control can have this style ((auto)radiobutton) and
   //GetNextDlgTabItem will return the wrong one
   //Happens in Opera preferences dialog (multimedia) where all autoradio
@@ -781 +781 @@
   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.
+   * So we need an extra compare to distinguish it.
+   * TODO: Scan for more occurences like this and other multi-bit flags
+   */
+  if ((dwStyle & BS_CENTER) == BS_LEFT) format = DT_LEFT;
+  else if ((dwStyle & BS_CENTER) == BS_CENTER) format = DT_CENTER;
+  else if (((dwStyle & BS_RIGHT) == BS_RIGHT) || ((dwExStyle & WS_EX_RIGHT) == BS_RIGHT)) format = DT_RIGHT;
+  else format = defHorz;
   if (!(dwStyle & BS_MULTILINE)) format |= DT_SINGLELINE;
 
@@ -1182 +1193 @@
 
       if (dwStyle & WS_DISABLED) {
-           DrawDisabledText(hDC,text,&rc,format); 
+           DrawDisabledText(hDC,text,&rc,format);
       }
       else