From a3a738ea230ead792aa747e4a66ced6e8bea8562 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sat, 5 Jan 2013 21:59:32 +0000 Subject: - Call the NSWindow super implementation of validateMenuItem: in SPWindow, fixing Show Toolbar/Hide Toolbar menu item title not being updated correctly - addresses Issue #1521 - When the toolbar is hidden, draw a line in the window to cover up the bottom border of the window's title bar, improving appearance - Improve tab appearance when toolbar is hidden --- Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Frameworks') diff --git a/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m index 6feb49a4..94b49254 100644 --- a/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m +++ b/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m @@ -508,7 +508,10 @@ if (([[tabBar window] isMainWindow] || [[[tabBar window] attachedSheet] isMainWindow]) && [NSApp isActive]) { lineColor = [NSColor darkGrayColor]; if ([cell state] == NSOnState) { - fillColor = [NSColor colorWithCalibratedWhite:(systemVersion >= 0x1070)?0.63f:0.59f alpha:1.0f]; + float tabWhiteComponent = (systemVersion >= 0x1070)?0.63f:0.59f; + if (![[[tabBar window] toolbar] isVisible]) tabWhiteComponent += 0.02f; + + fillColor = [NSColor colorWithCalibratedWhite:tabWhiteComponent alpha:1.0f]; shadowColor = [NSColor colorWithCalibratedWhite:0.0f alpha:0.7f]; } else { fillColor = [NSColor colorWithCalibratedWhite:(systemVersion >= 0x1070)?0.55f:0.495f alpha:1.0f]; @@ -517,7 +520,10 @@ } else { lineColor = [NSColor colorWithCalibratedWhite:0.49f alpha:1.0f]; if ([cell state] == NSOnState) { - fillColor = [NSColor colorWithCalibratedWhite:(systemVersion >= 0x1070)?0.85f:0.81f alpha:1.0f]; + float tabWhiteComponent = (systemVersion >= 0x1070)?0.85f:0.81f; + if (![[[tabBar window] toolbar] isVisible]) tabWhiteComponent += 0.01f; + + fillColor = [NSColor colorWithCalibratedWhite:tabWhiteComponent alpha:1.0f]; shadowColor = [NSColor colorWithCalibratedWhite:0.0f alpha:0.4f]; } else { fillColor = [NSColor colorWithCalibratedWhite:(systemVersion >= 0x1070)?0.79f:0.73f alpha:1.0f]; -- cgit v1.2.3