summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cocoa/BrowserView.m5
-rw-r--r--cocoa/gui.m4
2 files changed, 6 insertions, 3 deletions
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index c1a88225a..0aed72142 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -87,15 +87,14 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
if (NULL == browser->current_content) return;
NSRect frame = [self bounds];
-
- plot.clip(0, 0, frame.size.width, frame.size.height);
-
const NSRect *rects = NULL;
NSInteger count = 0;
[self getRectsBeingDrawn: &rects count: &count];
for (NSInteger i = 0; i < count; i++) {
+ plot.clip( NSMinX( rects[i] ), NSMinY( rects[i]), NSMaxX( rects[i] ), NSMaxY( rects[i] ) );
+
content_redraw(browser->current_content,
0,
0,
diff --git a/cocoa/gui.m b/cocoa/gui.m
index d7e5b8f79..4864d8897 100644
--- a/cocoa/gui.m
+++ b/cocoa/gui.m
@@ -24,6 +24,7 @@
#import "desktop/gui.h"
#import "desktop/netsurf.h"
#import "desktop/browser.h"
+#import "desktop/options.h"
char *default_stylesheet_url;
char *adblock_stylesheet_url;
@@ -60,6 +61,9 @@ struct browser_window;
struct gui_window *gui_create_browser_window(struct browser_window *bw,
struct browser_window *clone, bool new_tab)
{
+ if (clone != NULL) bw->scale = clone->scale;
+ else bw->scale = (float) option_scale / 100;
+
return (struct gui_window *)[[BrowserWindow alloc] initWithBrowser: bw];
}