Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/246326c5b4b926f23c69a6cbf988769b85c9ef98
...commit
http://git.netsurf-browser.org/netsurf.git/commit/246326c5b4b926f23c69a6cbf988769b85c9ef98
...tree
http://git.netsurf-browser.org/netsurf.git/tree/246326c5b4b926f23c69a6cbf988769b85c9ef98
The branch, svenw/cocoa has been updated
via 246326c5b4b926f23c69a6cbf988769b85c9ef98 (commit)
via 80075c9368a76b2445900d7dc56d3d6c7cc0ee2d (commit)
from d51af2004b541c1d003fd11e202a10c981d418b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=246326c5b4b926f23c69a6cbf988769b85c9ef98
commit 246326c5b4b926f23c69a6cbf988769b85c9ef98
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Use window background color for history popover.
diff --git a/frontends/cocoa/ArrowBox.m b/frontends/cocoa/ArrowBox.m
index 258a58c..6d6911d 100644
--- a/frontends/cocoa/ArrowBox.m
+++ b/frontends/cocoa/ArrowBox.m
@@ -23,6 +23,15 @@
#import "ArrowBox.h"
+#import "desktop/system_colour.h"
+#import "cocoa/plotter.h"
+
+@interface ArrowBox ()
+
+@property (nonatomic) NSColor *backgroundColor;
+
+@end
+
@implementation ArrowBox
@synthesize arrowPosition;
@@ -30,6 +39,17 @@
@synthesize arrowEdge;
@synthesize cornerRadius;
+- (NSColor *)backgroundColor {
+ if (!_backgroundColor) {
+ colour fill_colour;
+ nserror res = ns_system_colour_char("Window", &fill_colour);
+ NSAssert(res == NSERROR_OK, @"Expect to find the window colour");
+ _backgroundColor = cocoa_convert_colour(fill_colour);
+ }
+
+ return _backgroundColor;
+}
+
- (void)setArrowEdge:(ArrowEdge)newEdge
{
if (arrowEdge == newEdge) {
@@ -140,7 +160,7 @@
[path closePath];
[[NSColor colorWithDeviceWhite:1.0 alpha:0.4] set];
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.75] setFill];
+ [self.backgroundColor setFill];
NSAffineTransform *transform = [NSAffineTransform transform];
[transform translateXBy:bounds.origin.x yBy:bounds.origin.y];
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=80075c9368a76b2445900d7dc56d3d6c7cc0ee2d
commit 80075c9368a76b2445900d7dc56d3d6c7cc0ee2d
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Close window after closing the last tab.
diff --git a/frontends/cocoa/BrowserWindowController.m
b/frontends/cocoa/BrowserWindowController.m
index 8607e4d..f44e4fb 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -178,6 +178,9 @@
- (IBAction)closeCurrentTab:(id)sender
{
[self removeTab:activeBrowser];
+ if (tabView.numberOfTabViewItems == 0) {
+ [self.window close];
+ }
}
- (void)setCanGoBack:(BOOL)can
-----------------------------------------------------------------------
Summary of changes:
frontends/cocoa/ArrowBox.m | 22 +++++++++++++++++++++-
frontends/cocoa/BrowserWindowController.m | 3 +++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/frontends/cocoa/ArrowBox.m b/frontends/cocoa/ArrowBox.m
index 258a58c..6d6911d 100644
--- a/frontends/cocoa/ArrowBox.m
+++ b/frontends/cocoa/ArrowBox.m
@@ -23,6 +23,15 @@
#import "ArrowBox.h"
+#import "desktop/system_colour.h"
+#import "cocoa/plotter.h"
+
+@interface ArrowBox ()
+
+@property (nonatomic) NSColor *backgroundColor;
+
+@end
+
@implementation ArrowBox
@synthesize arrowPosition;
@@ -30,6 +39,17 @@
@synthesize arrowEdge;
@synthesize cornerRadius;
+- (NSColor *)backgroundColor {
+ if (!_backgroundColor) {
+ colour fill_colour;
+ nserror res = ns_system_colour_char("Window", &fill_colour);
+ NSAssert(res == NSERROR_OK, @"Expect to find the window colour");
+ _backgroundColor = cocoa_convert_colour(fill_colour);
+ }
+
+ return _backgroundColor;
+}
+
- (void)setArrowEdge:(ArrowEdge)newEdge
{
if (arrowEdge == newEdge) {
@@ -140,7 +160,7 @@
[path closePath];
[[NSColor colorWithDeviceWhite:1.0 alpha:0.4] set];
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.75] setFill];
+ [self.backgroundColor setFill];
NSAffineTransform *transform = [NSAffineTransform transform];
[transform translateXBy:bounds.origin.x yBy:bounds.origin.y];
diff --git a/frontends/cocoa/BrowserWindowController.m
b/frontends/cocoa/BrowserWindowController.m
index 8607e4d..f44e4fb 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -178,6 +178,9 @@
- (IBAction)closeCurrentTab:(id)sender
{
[self removeTab:activeBrowser];
+ if (tabView.numberOfTabViewItems == 0) {
+ [self.window close];
+ }
}
- (void)setCanGoBack:(BOOL)can
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
