mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 20:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixup merge of scheduled reformat

Browse Source
This commit is contained in:
Vincent Sanders 2014-07-06 11:01:39 +01:00
parent 0f151e37cb
commit caf918d2f2
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
atari/deskmenu.c
View File

@ -394,8 +394,8 @@ static void __CDECL menu_inc_scale(short item, short title, void *data)
if(input_window == NULL) if(input_window == NULL)
return; return;
browser_window_set_scale(input_window->bw, browser_window_set_scale(input_window->browser->bw,
browser_window_get_scale(input_window->bw) + 0.25, browser_window_get_scale(input_window->browser->bw) + 0.25,
true); true);
} }
@ -405,8 +405,8 @@ static void __CDECL menu_dec_scale(short item, short title, void *data)
if(input_window == NULL) if(input_window == NULL)
return; return;
browser_window_set_scale(input_window->bw, browser_window_set_scale(input_window->browser->bw,
browser_window_get_scale(input_window->bw) - 0.25, browser_window_get_scale(input_window->browser->bw) - 0.25,
true); true);
} }

2
atari/rootwin.c
View File

@ -834,7 +834,7 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area,
plot_set_dimensions(content_area->g_x, content_area->g_y, plot_set_dimensions(content_area->g_x, content_area->g_y,
content_area->g_w, content_area->g_h); content_area->g_w, content_area->g_h);
oldscale = plot_set_scale(browser_window_get_scale(rootwin->active_gui_window->bw)); oldscale = plot_set_scale(browser_window_get_scale(rootwin->active_gui_window->browser->bw));
/* first, we make the coords relative to the content area: */ /* first, we make the coords relative to the content area: */
content_area_rel.g_x = clip->g_x - content_area->g_x; content_area_rel.g_x = clip->g_x - content_area->g_x;

2
cocoa/gui.m
View File

@ -135,7 +135,7 @@ static void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
static void cocoa_window_reformat(struct gui_window *gw) static void cocoa_window_reformat(struct gui_window *gw)
{ {
if (gw != NULL) { if (gw != NULL) {
[[(BrowserViewController *)g browserView] reformat ]; [[(BrowserViewController *)gw browserView] reformat ];
} }
} }

2
framebuffer/gui.c
View File

@ -1758,7 +1758,7 @@ gui_window_remove_caret(struct gui_window *g)
} }
} }
static void nsgtk_window_reformat(struct gui_window *gw) static void framebuffer_window_reformat(struct gui_window *gw)
{ {
/** @todo if we ever do zooming reformat should be implemented */ /** @todo if we ever do zooming reformat should be implemented */
LOG(("window:%p", gw)); LOG(("window:%p", gw));