summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2019-05-20 13:30:57 +0200
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2019-05-20 13:30:57 +0200
commit07f4fd43802183721e3e69f2d828af5f5820ea5a (patch)
tree693e12b8b8a1d1d2ffd34bd786269d97ae30dcd6
parent159572785df885ef33663040af920e02a7950749 (diff)
More accurate implementation of Fl_Cocoa_Window_Driver::decoration_sizes().
-rw-r--r--src/Fl_cocoa.mm5
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx7
2 files changed, 5 insertions, 7 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index f1f3d795e..f7365630b 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1831,6 +1831,11 @@ static int get_window_frame_sizes(Fl_Window *win, int *pbx, int *pby) {
return top;
}
+void Fl_Cocoa_Window_Driver::decoration_sizes(int *top, int *left, int *right, int *bottom) {
+ *top = get_window_frame_sizes(pWindow, left, bottom);
+ *right = *left;
+}
+
/*
* smallest x coordinate in screen space of work area of menubar-containing display
*/
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index d1efc80c5..4df52f15d 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -256,13 +256,6 @@ void Fl_Cocoa_Window_Driver::hide() {
}
-void Fl_Cocoa_Window_Driver::decoration_sizes(int *top, int *left, int *right, int *bottom) {
- *top = 24;
- *left = 2;
- *right = 2;
- *bottom = 2;
-}
-
int Fl_Cocoa_Window_Driver::scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data)
{
CGImageRef img = CGImage_from_window_rect(src_x, src_y, src_w, src_h);