X11 geometry: use parsed width and height in negative calculations

If the user has specified a new dimension, that's how much we need to
offset the coordinates.

Using gw, gh is safe here: Fl_Screen_Driver::XParseGeometry() will only
update their values if there was a user-specified value.
This commit is contained in:
Ciaran Anscomb 2023-08-16 15:16:09 +01:00
parent 209f348ca4
commit b0de49b280

View File

@ -282,8 +282,8 @@ void Fl_Window::show(int argc, char **argv) {
if (geometry) { if (geometry) {
int fl = 0, gx = x(), gy = y(); unsigned int gw = w(), gh = h(); int fl = 0, gx = x(), gy = y(); unsigned int gw = w(), gh = h();
fl = Fl::screen_driver()->XParseGeometry(geometry, &gx, &gy, &gw, &gh); fl = Fl::screen_driver()->XParseGeometry(geometry, &gx, &gy, &gw, &gh);
if (fl & Fl_Screen_Driver::fl_XNegative) gx = Fl::w()-w()+gx; if (fl & Fl_Screen_Driver::fl_XNegative) gx = Fl::w()-gw+gx;
if (fl & Fl_Screen_Driver::fl_YNegative) gy = Fl::h()-h()+gy; if (fl & Fl_Screen_Driver::fl_YNegative) gy = Fl::h()-gh+gy;
// Determine window gravity from geometry. Note that negative X and Y // Determine window gravity from geometry. Note that negative X and Y
// will only end up truly accurate if the screen scale is (or has been // will only end up truly accurate if the screen scale is (or has been