Changeset 170 for trunk/src

Timestamp:

Jul 30, 2009, 10:52:54 PM (16 years ago)

Author:

lpino

Message:

• More Notebook display fixes

Location:

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

Files:

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

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

@@ -232 +232 @@
                 itemsID = newIDs;
         }
-//        PSZ tabText = new PSZ("Hello");
-         int pageID = OS.WinSendMsg (handle, OS.BKM_INSERTPAGE, 0, OS.MPFROM2SHORT((short)(OS.BKA_AUTOPAGESIZE | OS.BKA_MAJOR),(short)OS.BKA_LAST));
+         int pageID = OS.WinSendMsg (handle, OS.BKM_INSERTPAGE, 0, OS.MPFROM2SHORT((short)(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);
-//         OS.WinSendMsg (handle, OS.BKM_SETTABTEXT, pageID, tabText);
+         //@@INFO(lpino): The background of empty tabs are set to gray
+         OS.WinSendMsg (handle, OS.BKM_SETNOTEBOOKCOLORS, OS.SYSCLR_FIELDBACKGROUND , OS.BKA_BACKGROUNDPAGECOLORINDEX);
         if (pageID == OS.NULLHANDLE) {
                 error (SWT.ERROR_ITEM_NOT_ADDED);
@@ -309 +309 @@
 public Rectangle getClientArea () {
         checkWidget ();
-//      if (parent.hdwp != 0) {
-//              int oldHdwp = parent.hdwp;
-//              parent.hdwp = 0;
-//              OS.EndDeferWindowPos (oldHdwp);
-//              int count = parent.getChildrenCount ();
-//              parent.hdwp = OS.BeginDeferWindowPos (count);
-//      }
+        if (parent != null && parent.pswp != 0) {
+            endDeferWindowPos (parent);
+            int count = parent.getChildrenCount ();
+            beginDeferWindowPos (parent, count);
+        }
+        
         RECTL rect = new RECTL ();
         
         SWP swp = new SWP ();
         OS.WinQueryWindowPos (handle, swp);
-        
+                
         rect.yBottom = rect.xLeft = 0;
         rect.xRight = swp.cx;
@@ -329 +328 @@
         int width = rect.xRight - rect.xLeft;
         int height = rect.yTop - rect.yBottom;
+        int y = swp.cy-height;
+        
 //        System.out.println("XLEFT = " + rect.xLeft);
 //        System.out.println("YTOP = " + rect.yTop);
@@ -335 +336 @@
 //        System.out.println("width = " + width);
 //        System.out.println("height = " + height);
-//
-        return new Rectangle (rect.xLeft, rect.yTop, width, height);
+//        System.out.println("Delta = " + swp.y);
+
+        return new Rectangle (0, y, width, height);
 }
 
@@ -817 +819 @@
         switch (code) {
                 case OS.BKN_PAGESELECTED:                    
-//                    break;
                 case OS.BKN_PAGESELECTEDPENDING:
                         TabItem item = null;
@@ -837 +838 @@
                                 postEvent (SWT.Selection, event);
                         }
-                        break;
-            case OS.BKN_NEWPAGESIZE:
+//                        break;
+//            case OS.BKN_NEWPAGESIZE:
 //                System.out.println("resize");
-                break;
+//                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

@@ -3 +3 @@
 /*
  * OS/2 version.
- * Copyright (c) 2002, 2004 EclipseOS2 Team.
+ * Copyright (c) 2002, 2009 EclipseOS2 Team.
  */