summaryrefslogtreecommitdiff
path: root/src/Fl_cocoa.mm
diff options
context:
space:
mode:
authorAaron M. Ucko <ucko@debian.org>2010-10-12 18:14:10 -0400
committerAaron M. Ucko <ucko@debian.org>2010-10-12 18:14:10 -0400
commit8c9fe741d6a5b8eb7160af30642f6cf657505235 (patch)
tree8a4a546c13658056191b30844b66bd9a2df6bf05 /src/Fl_cocoa.mm
parent7736f3f1792840a02034abff81e8d7f58a833d0a (diff)
Imported Upstream version 1.3~r7710
Diffstat (limited to 'src/Fl_cocoa.mm')
-rw-r--r--src/Fl_cocoa.mm10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 6f4baaa..2c0770d 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1624,7 +1624,7 @@ static void get_window_frame_sizes(int &bx, int &by, int &bt) {
* smallest x ccordinate in screen space
*/
int Fl::x() {
- return [[NSScreen mainScreen] frame].origin.x;
+ return [[NSScreen mainScreen] visibleFrame].origin.x;
}
@@ -1639,7 +1639,7 @@ int Fl::y() {
/*
- * screen width (single monitor!?)
+ * screen width
*/
int Fl::w() {
return [[NSScreen mainScreen] visibleFrame].size.width;
@@ -1647,12 +1647,10 @@ int Fl::w() {
/*
- * screen height (single monitor!?)
+ * screen height
*/
int Fl::h() {
- int bx, by, bt;
- get_window_frame_sizes(bx, by, bt);
- return [[NSScreen mainScreen] frame].size.height - bt;
+ return [[NSScreen mainScreen] visibleFrame].size.height;
}