marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

C4WindowController.mm: Only implement some viewport methods if not defined by qt editor implementation somewhere

qteditor
Martin Plicht 2016-07-11 00:21:45 +02:00
parent 2cfd743777
commit 450619bac8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/platform/C4WindowController.mm
View File

@ -241,6 +241,7 @@ bool lionAndBeyond() {return osVersion() >= 0x1070;}
// C4ViewportWindow
#if !defined(WITH_QT_EDITOR)
bool C4Viewport::ScrollBarsByViewPosition()
{
if (PlayerLock) return false;
@ -250,14 +251,6 @@ bool C4Viewport::ScrollBarsByViewPosition()
return true;
}
bool C4Viewport::ViewPositionByScrollBars()
{
NSScrollView* scrollView = pWindow->objectiveCObject<C4WindowController>().scrollView;
SetViewX([scrollView.horizontalScroller landscapeCoordinateForSize:Landscape.GetWidth() viewportSize:ViewWdt zoom:GetZoom()]);
SetViewY([scrollView.verticalScroller landscapeCoordinateForSize:Landscape.GetHeight() viewportSize:ViewHgt zoom:GetZoom()]);
return true;
}
bool C4Viewport::TogglePlayerLock()
{
NSScrollView* scrollView = pWindow->objectiveCObject<C4WindowController>().scrollView;
@ -284,5 +277,14 @@ bool C4Viewport::TogglePlayerLock()
}
return true;
}
#endif
bool C4Viewport::ViewPositionByScrollBars()
{
NSScrollView* scrollView = pWindow->objectiveCObject<C4WindowController>().scrollView;
SetViewX([scrollView.horizontalScroller landscapeCoordinateForSize:Landscape.GetWidth() viewportSize:ViewWdt zoom:GetZoom()]);
SetViewY([scrollView.verticalScroller landscapeCoordinateForSize:Landscape.GetHeight() viewportSize:ViewHgt zoom:GetZoom()]);
return true;
}
#endif