From a12b59db6cae91e72bd772012bc19ff34189527b Mon Sep 17 00:00:00 2001 From: Randy Boring Date: Thu, 28 Feb 2019 21:22:33 -0600 Subject: [PATCH] make the background of the graphic white, while making the rest of the background the theme-based color --- .../KMAboutWindow/KMAboutBGView.m | 22 ++++++++++++++++++- .../KMAboutWindow/KMAboutWindowController.xib | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutBGView.m b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutBGView.m index 691dc1a6df..e2f748ee3f 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutBGView.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutBGView.m @@ -10,9 +10,29 @@ @implementation KMAboutBGView +// draw white behind the graphic at the top of the view, +// draw the theme's background color behind the rest of the view +// e.g., rect origin=(0,0) size=(318,450) +// topImgView origin=(15,252) size=(58,400) +// topFill origin=(0,252) size=(66,450) +// botFill origin=(0,0) size=(252,450) - (void)drawRect:(NSRect)rect { + NSRect topFill, botFill; + topFill = rect; + botFill = rect; +// NSLog(@"rect origin x %f y %f size h %f w %f", rect.origin.x, rect.origin.y, rect.size.height, rect.size.width); + NSView *topImgView = [self viewWithTag:1]; +// NSLog(@"topImgView origin x %f y %f size h %f w %f before", topImgView.frame.origin.x, topImgView.frame.origin.y, topImgView.frame.size.height, topImgView.frame.size.width); + NSInteger imgOriginHeightDelta = topImgView.frame.origin.y - rect.origin.y; + topFill.origin.y += imgOriginHeightDelta; + topFill.size.height -= imgOriginHeightDelta; + botFill.size.height = imgOriginHeightDelta; +// NSLog(@"topFill origin x %f y %f size h %f w %f after raising to imgHeight %ld", topFill.origin.x, topFill.origin.y, topFill.size.height, topFill.size.width, imgOriginHeightDelta); +// NSLog(@"botFill origin x %f y %f size h %f w %f after reducing by imgHeight %ld", botFill.origin.x, botFill.origin.y, botFill.size.height, botFill.size.width, imgOriginHeightDelta); + [[NSColor whiteColor] setFill]; + NSRectFillUsingOperation(topFill, NSCompositeSourceOver); [[NSColor windowBackgroundColor] setFill]; - NSRectFillUsingOperation(rect, NSCompositeSourceOver); + NSRectFillUsingOperation(botFill, NSCompositeSourceOver); } - (BOOL)mouseDownCanMoveWindow { diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.xib b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.xib index c8eeddb0f6..8e341aca3a 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.xib +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.xib @@ -92,7 +92,7 @@ - +