From f4afcd88bec96d2bbd7a1e22ddfd9d37912c74d7 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 1 Sep 2013 16:57:43 +0000 Subject: [PATCH] CtrlCore: X11Top.cpp centering fix (thanks Klugier) git-svn-id: svn://ultimatepp.org/upp/trunk@6299 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/X11Top.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlCore/X11Top.cpp b/uppsrc/CtrlCore/X11Top.cpp index c46986905..1ac8cfa3e 100644 --- a/uppsrc/CtrlCore/X11Top.cpp +++ b/uppsrc/CtrlCore/X11Top.cpp @@ -238,8 +238,9 @@ void TopWindow::CenterRect(Ctrl *owner) else r = wr; Point p = r.CenterPos(sz); - r = RectC(p.x, p.y, sz.cx, sz.cy); + if (p.x <= wr.Width() && p.y <= wr.Height()) { + r = RectC(p.x, p.y, sz.cx, sz.cy); wr.left += fm.left; wr.right -= fm.right; wr.top += fm.top; @@ -252,8 +253,8 @@ void TopWindow::CenterRect(Ctrl *owner) r.bottom = wr.bottom; minsize.cx = min(minsize.cx, r.GetWidth()); minsize.cy = min(minsize.cy, r.GetHeight()); + SetRect(r); } - SetRect(r); } }