github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-31 07:12:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Fixed issue with STDSIZE in *PosZ

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13904 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-01-17 08:00:59 +00:00
parent f150a0f8ea
commit ac2f668cfd
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
uppsrc/CtrlCore/Ctrl.cpp
View file

@ -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);
}

2
uppsrc/CtrlCore/gtk3-todo.txt
View file

@ -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))