From ac2f668cfdc79e1f81d581fd36211fb658485618 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 17 Jan 2020 08:00:59 +0000
Subject: [PATCH] CtrlCore: Fixed issue with STDSIZE in *PosZ

git-svn-id: svn://ultimatepp.org/upp/trunk@13904 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/Ctrl.cpp      | 10 ++++------
 uppsrc/CtrlCore/gtk3-todo.txt |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp
index 62903a0bc..e91750b47 100644
--- a/uppsrc/CtrlCore/Ctrl.cpp
+++ b/uppsrc/CtrlCore/Ctrl.cpp
@@ -796,30 +796,28 @@ void Ctrl::GetZoomRatio(Size& m, Size& d)
 int  Ctrl::HorzLayoutZoom(int cx)
 {
 	Csizeinit();
-	return Csize.cx * cx / Dsize.cx;
+	return cx > -16000 ? Csize.cx * cx / Dsize.cx : cx;
 }
 
 double  Ctrl::HorzLayoutZoomf(double cx)
 {
 	Csizeinit();
-	return Csize.cx * cx / Dsize.cx;
+	return cx > -16000 ? Csize.cx * cx / Dsize.cx : cx;
 }
 
 int  Ctrl::VertLayoutZoom(int cy)
 {
 	Csizeinit();
-	return Csize.cy * cy / Dsize.cy;
+	return cy > -16000 ? Csize.cy * cy / Dsize.cy : cy;
 }
 
 Size Ctrl::LayoutZoom(int cx, int cy)
 {
-	Csizeinit();
-	return Size(Csize.cx * cx / Dsize.cx, Csize.cy * cy / Dsize.cy);
+	return Size(HorzLayoutZoom(cx), VertLayoutZoom(cy));
 }
 
 Size Ctrl::LayoutZoom(Size sz)
 {
-	Csizeinit();
 	return LayoutZoom(sz.cx, sz.cy);
 }
 
diff --git a/uppsrc/CtrlCore/gtk3-todo.txt b/uppsrc/CtrlCore/gtk3-todo.txt
index 6ee8a4ed6..a32a05209 100644
--- a/uppsrc/CtrlCore/gtk3-todo.txt
+++ b/uppsrc/CtrlCore/gtk3-todo.txt
@@ -1,7 +1,6 @@
 - Possible issue with Capture (e.g. ide about box)
 
 - Issue with editfield text clipping in the right
-- DropChoice STDSIZE (.TopPosZ(10))
 - LeftRoundness with DropChoice (DropChoiceRdO)
 - DnD crash?
 - GUILock docs
@@ -78,3 +77,4 @@ DONE:
 - Scrollbars disabled monocolor
 - spinbutton cosmetics
 - ide missing vertical line
+- DropChoice STDSIZE (.TopPosZ(10))