summaryrefslogtreecommitdiff
path: root/cocoa
diff options
context:
space:
mode:
authorSven Weidauer <sven.weidauer@gmail.com>2011-01-26 13:42:52 +0000
committerSven Weidauer <sven.weidauer@gmail.com>2011-01-26 13:42:52 +0000
commit56fb20de83ef74934183ca2dc45a81626dae4e64 (patch)
tree9997e83e5e51f2fd3afb80bab99f8e44908d91ad /cocoa
parentda01624374ea884fffb15d10a295ded84c6619af (diff)
downloadnetsurf-56fb20de83ef74934183ca2dc45a81626dae4e64.tar.gz
netsurf-56fb20de83ef74934183ca2dc45a81626dae4e64.tar.bz2
Leaving history overlay active after navigating using the back/forwards buttons.
svn path=/trunk/netsurf/; revision=11495
Diffstat (limited to 'cocoa')
-rw-r--r--cocoa/BrowserViewController.h1
-rw-r--r--cocoa/BrowserViewController.m5
2 files changed, 5 insertions, 1 deletions
diff --git a/cocoa/BrowserViewController.h b/cocoa/BrowserViewController.h
index 1e817a4dd..71235865a 100644
--- a/cocoa/BrowserViewController.h
+++ b/cocoa/BrowserViewController.h
@@ -34,6 +34,7 @@ struct browser_window;
NSImage *favicon;
BOOL canGoBack;
BOOL canGoForward;
+ BOOL navigatedUsingBackForwards;
}
@property (readwrite, assign, nonatomic) struct browser_window *browser;
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m
index 0afe4b2f7..28c911457 100644
--- a/cocoa/BrowserViewController.m
+++ b/cocoa/BrowserViewController.m
@@ -96,6 +96,7 @@
- (IBAction) goBack: (id) sender;
{
if (browser && history_back_available( browser->history )) {
+ navigatedUsingBackForwards = YES;
history_back(browser, browser->history);
[self updateBackForward];
}
@@ -104,6 +105,7 @@
- (IBAction) goForward: (id) sender;
{
if (browser && history_forward_available( browser->history )) {
+ navigatedUsingBackForwards = YES;
history_forward(browser, browser->history);
[self updateBackForward];
}
@@ -164,7 +166,8 @@ static inline bool compare_float( float a, float b )
- (void) contentUpdated;
{
- [browserView setHistoryVisible: NO];
+ if (!navigatedUsingBackForwards) [browserView setHistoryVisible: NO];
+ navigatedUsingBackForwards = NO;
}
@end