Skip to content

Commit

Permalink
Defined USE_GL_GORE_PROFILE on Windows.
Browse files Browse the repository at this point in the history
  • Loading branch information
hidefuku committed Apr 28, 2017
1 parent 23c286e commit 2c59002
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/common.pri
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ DEFINES += "AE_PROJECT_FORMAT_OLDEST_MAJOR_VERSION=0"
DEFINES += "AE_PROJECT_FORMAT_OLDEST_MINOR_VERSION=4"

# OpenGL CoreProfile Option
unix {
DEFINES += USE_GL_CORE_PROFILE
}

unix:!macx {
QMAKE_RPATHDIR += ./
}
Expand Down
9 changes: 7 additions & 2 deletions src/gui/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,14 @@ MainWindow::MainWindow(ctrl::System& aSystem, GUIResources& aResources, const Lo

// create main display
{
#if defined(Q_OS_WIN)
const float fontScale = 1.5f;
#else
const float fontScale = 1.3f;
#endif
auto font = this->font();
if (font.pixelSize() > 0) font.setPixelSize((int)(font.pixelSize() * 1.3f));
else font.setPointSizeF(font.pointSizeF() * 1.3f);
if (font.pixelSize() > 0) font.setPixelSize((int)(font.pixelSize() * fontScale));
else font.setPointSizeF(font.pointSizeF() * fontScale);
mMainDisplayStyle.reset(new MainDisplayStyle(font, mGUIResources));
mMainDisplay = new MainDisplayWidget(mViaPoint, this);
this->setCentralWidget(mMainDisplay);
Expand Down

0 comments on commit 2c59002

Please sign in to comment.