TabViewTest: some drawing ehnacements

trunkmaster · Oct 24, 2024 · a657410 · a657410
1 parent 0bfdd74
commit a657410
Showing 1 changed file with 25 additions and 21 deletions.
diff --git a/Tests/DesktopKit/TabViewTest.m b/Tests/DesktopKit/TabViewTest.m
@@ -95,46 +95,44 @@ - (void)drawRect:(NSRect)rect
   // Fill view background
   DPSsetgray(ctxt, 0.33);
   DPSrectfill(ctxt, 0, 0, rect.size.width, rect.size.height);
+  // Fill tab view background
+  DPSsetgray(ctxt, 0.66);
+  DPSrectfill(ctxt, 0, 0, rect.size.width, rect.size.height - offset - tabHeight);
 
-  // // Fill text background
-  // DPSsetgray(ctxt, 0.66);
-  // DPSrectfill(ctxt, offset + edgeLeft.size.width, rect.size.height - offset,
-  //             40 - edgeLeft.size.width, tabHeight);
-
-  // DPSsetgray(ctxt, 1.0);
-  // DPSmoveto(ctxt, offset + edgeLeft.size.width, rect.size.height - offset);
-  // DPSlineto(ctxt, offset + edgeLeft.size.width + 40, rect.size.height - offset);
-  // DPSstroke(ctxt);
+  // White line between views and tabs
+  DPSsetgray(ctxt, 0.95);
+  DPSmoveto(ctxt, 0, (rect.size.height - offset - tabHeight) + 1);
+  DPSlineto(ctxt, rect.size.width, (rect.size.height - offset - tabHeight) + 1);
+  DPSstroke(ctxt);
 
+  // Unselected
+  edgeLeft = [self imageForSide:@"Left" backgroundColor:unselectedBackground];
+  [edgeLeft
+      drawAtPoint:NSMakePoint(edgeLeft.size.width + tabWidth,
+                              rect.size.height - offset - tabHeight)
+         fromRect:NSMakeRect(0, edgeLeft.size.height - tabHeight, edgeLeft.size.width, tabHeight)
+        operation:NSCompositeSourceOver
+         fraction:1.0];
+  [edgeLeft release];
 
+  // Selected tab
   edgeLeft = [self imageForSide:@"Left" backgroundColor:selectedBackground];
   [edgeLeft
       drawAtPoint:NSMakePoint(0, rect.size.height - offset - tabHeight)
          fromRect:NSMakeRect(0, edgeLeft.size.height - tabHeight, edgeLeft.size.width, tabHeight)
         operation:NSCompositeSourceOver
          fraction:1.0];
-  // Left white line
-  DPSsetgray(ctxt, 0.95);
-  DPSmoveto(ctxt, 0, (rect.size.height - offset - tabHeight) + 1);
-  DPSlineto(ctxt, offset + 2, (rect.size.height - offset - tabHeight) + 1);
   // Fill text background
   DPSsetgray(ctxt, 0.66);
   DPSrectfill(ctxt, edgeLeft.size.width, rect.size.height - offset - tabHeight, tabWidth,
               tabHeight);
+
   // Top white line
   DPSsetgray(ctxt, 1.0);
   DPSmoveto(ctxt, edgeLeft.size.width, rect.size.height - offset);
   DPSlineto(ctxt, edgeLeft.size.width + tabWidth, rect.size.height - offset);
   DPSstroke(ctxt);
-  [edgeLeft release];
 
-  edgeLeft = [self imageForSide:@"Left" backgroundColor:unselectedBackground];
-  [edgeLeft
-      drawAtPoint:NSMakePoint(edgeLeft.size.width + tabWidth,
-                              rect.size.height - offset - tabHeight)
-         fromRect:NSMakeRect(0, edgeLeft.size.height - tabHeight, edgeLeft.size.width, tabHeight)
-        operation:NSCompositeSourceOver
-         fraction:1.0];
   [edgeLeft release];
 
   edgeRight = [self imageForSide:@"Right" backgroundColor:selectedBackground];
@@ -144,7 +142,13 @@ - (void)drawRect:(NSRect)rect
          fromRect:NSMakeRect(0, edgeRight.size.height - tabHeight, edgeRight.size.width, tabHeight)
         operation:NSCompositeSourceAtop
          fraction:1.0];
+  // Right white line
+  // DPSsetgray(ctxt, 0.95);
+  // DPSmoveto(ctxt, tabWidth + (edgeRight.size.width * 2) - 8, (rect.size.height - offset - tabHeight) + 1);
+  // DPSlineto(ctxt, rect.size.width, (rect.size.height - offset - tabHeight) + 1);
+  // DPSstroke(ctxt);
   [edgeRight release];
+
 }
 
 @end