Finetune content view height

Required especially for vibrancy with titlebar present
streemline · Sep 30, 2018 · f99a35b · f99a35b
1 parent 83e087f
commit f99a35b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/PshWindow.h b/PshWindow.h
@@ -44,7 +44,7 @@
     NSString *cancelButtonkey;
     NSString *defaultButtonkey;
     NSStringEncoding encoding; // Encoding to return values in
-
+    int contentViewExtraHeight;
     NSButton *defaultButton;
     NSButton *cancelButton;
 

diff --git a/PshWindow.m b/PshWindow.m
@@ -89,6 +89,7 @@ - (id)initWithAttributes:(NSDictionary *)theAttributes
                         [[theAttributes objectForKey:@"transparency"] floatValue] : DEFAULT_ALPHA];
 
     // Add content view
+    contentViewExtraHeight = 0;
     NSView *contentView = [[NSView alloc] initWithFrame:[self frame]];
     [self setContentView:contentView];
     [contentView release];
@@ -120,14 +121,21 @@ - (id)initWithAttributes:(NSDictionary *)theAttributes
             [effectView setBlendingMode: NSVisualEffectBlendingModeBehindWindow];
             [self setContentView:effectView];
             [effectView release];
+            contentViewExtraHeight += 10;
             self.styleMask = self.styleMask | NSFullSizeContentViewWindowMask;
         }
 
         // With/Without titlebar
         if ([theAttributes objectForKey:@"titlebar"] &&
             [[theAttributes objectForKey:@"titlebar"] isEqualToString:@"0"]) {
             self.titlebarAppearsTransparent = TRUE;
+            if (!vibrant) {
+                contentViewExtraHeight -= 10;
+            }
         } else {
+            if (vibrant) {
+                contentViewExtraHeight += 10;
+            }
             self.titlebarAppearsTransparent = FALSE;
         }
     }
@@ -208,6 +216,8 @@ - (void)setupWindowWithElements:(NSArray *)theElements {
     [self finishCancelButton];
     [self finishDefaultButton];
 
+    [self setContentSize:NSMakeSize([[self contentView] frame].size.width, [[self contentView] frame].size.height + contentViewExtraHeight)];
+
     [elmnts release];
 }