Changeset 169 for trunk/src

Timestamp:

Jul 14, 2009, 9:09:16 PM (16 years ago)

Author:

lpino

Message:

• Fix display problems

Location:

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets

Files:

• TabFolder.java (modified) (11 diffs)
• TabItem.java (modified) (1 diff)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/TabFolder.java

@@ -184 +184 @@
 
 //      RECT insetRect = new RECT (), itemRect = new RECT ();
-//      OS.WinSendMsg (handle, OS.BKM_CALCPAGERECT, rcl, false);
 //      OS.SendMessage (handle, OS.TCM_ADJUSTRECT, 0, insetRect);
 //      int width = insetRect.left - insetRect.right, height = 0;
@@ -192 +191 @@
 //              width = Math.max (width, itemRect.right - insetRect.right);
 //      }
-//      Point size;
+        Point size;
 //      if (layout != null) {
 //              size = layout.computeSize (this, wHint, hHint, changed);
@@ -208 +207 @@
 //      return new Point (width, height);
 //}
-//
+
 //public Rectangle computeTrim (int x, int y, int width, int height) {
 //      checkWidget ();
@@ -234 +233 @@
         }
 //        PSZ tabText = new PSZ("Hello");
-         int pageID = OS.WinSendMsg (handle, OS.BKM_INSERTPAGE, 0, OS.MPFROM2SHORT((short)(OS.BKA_AUTOPAGESIZE | OS.BKA_MAJOR | OS.BKA_STATUSTEXTON),(short)OS.BKA_LAST));
+         int pageID = OS.WinSendMsg (handle, OS.BKM_INSERTPAGE, 0, OS.MPFROM2SHORT((short)(OS.BKA_AUTOPAGESIZE | OS.BKA_MAJOR),(short)OS.BKA_LAST));
          //@@INFO(lpino): All tabs are gray to keep a consistent look with the rests of the platforms
          OS.WinSendMsg (handle, OS.BKM_SETTABCOLOR, pageID , 0x00C0C0C0);
@@ -308 +307 @@
 }
 
-//public Rectangle getClientArea () {
-//      checkWidget ();
+public Rectangle getClientArea () {
+        checkWidget ();
 //      if (parent.hdwp != 0) {
 //              int oldHdwp = parent.hdwp;
@@ -317 +316 @@
 //              parent.hdwp = OS.BeginDeferWindowPos (count);
 //      }
-//      RECT rect = new RECT ();
-//      OS.GetClientRect (handle, rect);
-//      OS.SendMessage (handle, OS.TCM_ADJUSTRECT, 0, rect);
-//      int width = rect.right - rect.left;
-//      int height = rect.bottom - rect.top;
-//      return new Rectangle (rect.left, rect.top, width, height);
-//}
+        RECTL rect = new RECTL ();
+        
+        SWP swp = new SWP ();
+        OS.WinQueryWindowPos (handle, swp);
+        
+        rect.yBottom = rect.xLeft = 0;
+        rect.xRight = swp.cx;
+        rect.yTop = swp.cy;
+
+        OS.WinSendMsg(handle, OS.BKM_CALCPAGERECT, rect, true);
+        
+        int width = rect.xRight - rect.xLeft;
+        int height = rect.yTop - rect.yBottom;
+//        System.out.println("XLEFT = " + rect.xLeft);
+//        System.out.println("YTOP = " + rect.yTop);
+//        System.out.println("XRIGHT = " + rect.xRight);
+//        System.out.println("YBOTTOM = " + rect.yBottom);
+//        System.out.println("width = " + width);
+//        System.out.println("height = " + height);
+//
+        return new Rectangle (rect.xLeft, rect.yTop, width, height);
+}
 
 /**
@@ -692 +706 @@
                   (short)OS.BKA_MAJORTAB);
 
-       OS.WinSendMsg(handle, OS.BKM_SETDIMENSIONS,
-                 OS.MPFROM2SHORT((short)0, (short)0),
-                 (short)OS.BKA_MINORTAB);
+       OS.WinSendMsg(handle, OS.BKM_SETDIMENSIONS, OS.MPFROM2SHORT((short)0, (short)0),(short)OS.BKA_MINORTAB);
   return true;
 }
@@ -736 +748 @@
 //}
 //
-//LRESULT WM_SIZE (int wParam, int lParam) {
-//      LRESULT result = super.WM_SIZE (wParam, lParam);
+MRESULT WM_SIZE (int mp1, int mp2) {
+        MRESULT result = super.WM_SIZE (mp1, mp2);
 //      /*
 //      * It is possible (but unlikely), that application
@@ -754 +766 @@
 //              }
 //      }
-//      return result;
-//}
-//
+        return result;
+}
+
 //LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) {
 //      LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
@@ -804 +816 @@
         int code = mp1 >> 16;
         switch (code) {
-                case OS.BKN_PAGESELECTED: 
+                case OS.BKN_PAGESELECTED:                    
+//                    break;
                 case OS.BKN_PAGESELECTEDPENDING:
                         TabItem item = null;
@@ -824 +837 @@
                                 postEvent (SWT.Selection, event);
                         }
+                        break;
             case OS.BKN_NEWPAGESIZE:
+//                System.out.println("resize");
+                break;
          //     if (isDisposed ()) return result;
         //      int index = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0);

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/TabItem.java

@@ -206 +206 @@
         this.control = control;
         int index = parent.indexOf (this);
+        OS.WinSendMsg (parent.handle, OS.BKM_SETPAGEWINDOWHWND, this.parent.itemsID[index], control.handle);        
         if (index != parent.getSelectionIndex ()) {
                 if (newControl != null) newControl.setVisible (false);