Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix scrollbar and scene editor size on OS X with Retina screens

Browse Source
This commit is contained in:
Florian Rival
2015-09-04 21:48:48 +02:00
parent 6aea0e3306
commit aa297614f0
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas2.cpp
View File

@@ -681,11 +681,9 @@ void LayoutEditorCanvas::UpdateSize()
unsigned int height = parentControl->GetSize().GetHeight()- (hScrollbar ? hScrollbar->GetSize().GetHeight() : 0);
double scaleFactor = GUIContentScaleFactor::Get();
width *= scaleFactor;
height *= scaleFactor;
//Scene takes all the space available in edition mode.
Window::setSize(sf::Vector2u(width, height));
Window::setSize(sf::Vector2u(width * scaleFactor, height * scaleFactor));
wxWindowBase::SetPosition(wxPoint(0,0));
wxWindowBase::SetSize(width, height);
@@ -743,19 +741,19 @@ void LayoutEditorCanvas::UpdateScrollbars()
if ( thumbY <= 0 || static_cast<int>(thumbY+getSize().y) >= vScrollbar->GetRange())
{
int ajout = getSize().y;
vScrollbar->SetScrollbar(thumbY+ajout/2, getSize().y, vScrollbar->GetRange()+ajout, getSize().y);
int offset = getSize().y;
vScrollbar->SetScrollbar(thumbY+offset/2, getSize().y, vScrollbar->GetRange()+offset, getSize().y);
}
if ( thumbX <= 0 || static_cast<int>(thumbX+getSize().x) >= hScrollbar->GetRange())
{
int ajout = getSize().x;
hScrollbar->SetScrollbar(thumbX+ajout/2, getSize().x, hScrollbar->GetRange()+ajout, getSize().x);
int offset = getSize().x;
hScrollbar->SetScrollbar(thumbX+offset/2, getSize().x, hScrollbar->GetRange()+offset, getSize().x);
}
}
void LayoutEditorCanvas::UpdateViewAccordingToZoomFactor()
{
editionView.setSize(GetClientSize().GetWidth()/options.zoomFactor, GetClientSize().GetHeight()/options.zoomFactor);
editionView.setSize(getSize().x/options.zoomFactor, getSize().y/options.zoomFactor);
}
void LayoutEditorCanvas::OnHelpBtClick( wxCommandEvent & event )