From 67fa81636d54bec25cde1ca7e1330c9101963f57 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 16 Dec 2009 14:50:42 +0000 Subject: [PATCH] oops, fix --- panda/src/osxdisplay/osxGraphicsWindow.mm | 8 ++++---- panda/src/tinydisplay/tinyOsxGraphicsWindow.mm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/panda/src/osxdisplay/osxGraphicsWindow.mm b/panda/src/osxdisplay/osxGraphicsWindow.mm index fc350bc6e9..e0cc166ed9 100644 --- a/panda/src/osxdisplay/osxGraphicsWindow.mm +++ b/panda/src/osxdisplay/osxGraphicsWindow.mm @@ -1825,11 +1825,11 @@ do_reshape_request(int x_origin, int y_origin, bool has_origin, if (x_origin == -2) { x_origin = 0.5 * (_pipe->get_display_width() - x_size); } - if (r.top == -1) { - r.top = 50; + if (y_origin == -1) { + y_origin = 50; } - if (r.left == -1) { - r.left = 10; + if (x_origin == -1) { + x_origin = 10; } _properties.set_origin(x_origin, y_origin); system_changed_properties(_properties); diff --git a/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm b/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm index bd6be1a4ad..b54efb383b 100644 --- a/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm +++ b/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm @@ -1557,11 +1557,11 @@ bool TinyOsxGraphicsWindow::do_reshape_request(int x_origin, int y_origin, bool if (x_origin == -2) { x_origin = 0.5 * (_pipe->get_display_width() - x_size); } - if (r.top == -1) { - r.top = 50; + if (y_origin == -1) { + y_origin = 50; } - if (r.left == -1) { - r.left = 10; + if (x_origin == -1) { + x_origin = 10; } _properties.set_origin(x_origin, y_origin); system_changed_properties(_properties);