update cocoa frontend with reformat API change

This commit is contained in:
Vincent Sanders 2017-04-26 09:52:39 +01:00
parent 72bd28d16e
commit 413ee474d2
3 changed files with 13 additions and 22 deletions

View File

@ -47,7 +47,6 @@
- (void) removeCaret;
- (void) addCaretAt: (NSPoint) point height: (CGFloat) height;
- (void) reformat;
- (void) updateHistory;
@end

View File

@ -43,8 +43,6 @@
- (void) scrollVertical: (CGFloat) amount;
- (CGFloat) pageScroll;
- (void) reformat;
- (void) popUpContextMenuForEvent: (NSEvent *) event;
- (IBAction) cmOpenURLInTab: (id) sender;
@ -505,14 +503,6 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
return NSHeight( [[self superview] frame] ) - [[self enclosingScrollView] pageScroll];
}
- (void) reformat
{
NSRect size = [[self superview] frame];
browser_window_reformat(browser,
false,
cocoa_pt_to_px( NSWidth( size ) ),
cocoa_pt_to_px( NSHeight( size ) ) );
}
- (void) popUpContextMenuForEvent: (NSEvent *) event
{

View File

@ -129,18 +129,19 @@ static void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
[[(BrowserViewController *)g browserView] scrollPoint: cocoa_point( sx, sy )];
}
/**
* callback from core to reformat a window.
* Find the current dimensions of a cocoa browser window content area.
*
* \param gw The gui window to measure content area of.
* \param width receives width of window
* \param height receives height of window
* \param scaled whether to return scaled values
* \return NSERROR_OK on sucess and width and height updated
* else error code.
*/
static void cocoa_window_reformat(struct gui_window *gw)
{
if (gw != NULL) {
[[(BrowserViewController *)gw browserView] reformat ];
}
}
static void gui_window_get_dimensions(struct gui_window *g,
static nserror gui_window_get_dimensions(struct gui_window *g,
int *width, int *height,
bool scaled)
{
@ -154,6 +155,8 @@ static void gui_window_get_dimensions(struct gui_window *g,
}
*width = cocoa_pt_to_px( NSWidth( frame ) );
*height = cocoa_pt_to_px( NSHeight( frame ) );
return NSERROR_OK;
}
static void gui_window_update_extent(struct gui_window *g)
@ -304,7 +307,6 @@ static struct gui_window_table window_table = {
.set_scroll = gui_window_set_scroll,
.get_dimensions = gui_window_get_dimensions,
.update_extent = gui_window_update_extent,
.reformat = cocoa_window_reformat,
.set_title = gui_window_set_title,
.set_url = gui_window_set_url,