summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-10-19 13:33:19 +0200
committerkrzys-h <krzys_h@interia.pl>2014-10-19 13:33:19 +0200
commit0fb1cb11d4675f17023de43b3ffed6314ce31e8c (patch)
treefd126da167cf340402b1c93dc02fe5d989193d6d /src
parent7af92cc4ce04ecf5e9232bc89acee6311c0f6bc4 (diff)
downloadcolobot-0fb1cb11d4675f17023de43b3ffed6314ce31e8c.tar.gz
colobot-0fb1cb11d4675f17023de43b3ffed6314ce31e8c.tar.bz2
colobot-0fb1cb11d4675f17023de43b3ffed6314ce31e8c.zip
Changed max and default font size
Min font size is 9, max is now 24 (previously 21) Default size is now 19 (previously 9) Closes #330
Diffstat (limited to 'src')
-rw-r--r--src/object/robotmain.cpp2
-rw-r--r--src/ui/displayinfo.cpp18
-rw-r--r--src/ui/studio.cpp4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 43b1bf9..2ca2409 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -715,7 +715,7 @@ CRobotMain::CRobotMain(CApplication* app, bool loadProfile)
FlushDisplayInfo();
- m_fontSize = 9.0f;
+ m_fontSize = 19.0f;
m_windowPos = Math::Point(0.15f, 0.17f);
m_windowDim = Math::Point(0.70f, 0.66f);
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp
index d619f00..891c1ab 100644
--- a/src/ui/displayinfo.cpp
+++ b/src/ui/displayinfo.cpp
@@ -158,28 +158,28 @@ bool CDisplayInfo::EventProcess(const Event &event)
{
m_main->SetFontSize(9.0f);
slider = static_cast<Ui::CSlider*>(pw->SearchControl(EVENT_STUDIO_SIZE));
- if ( slider != 0 ) slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/12.0f);
+ if ( slider != 0 ) slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/15.0f);
ViewDisplayInfo();
}
if ( event.type == EVENT_HYPER_SIZE2 ) // size 2?
{
- m_main->SetFontSize(10.0f);
+ m_main->SetFontSize(14.0f);
slider = static_cast<Ui::CSlider*>(pw->SearchControl(EVENT_STUDIO_SIZE));
- if ( slider != 0 ) slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/12.0f);
+ if ( slider != 0 ) slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/15.0f);
ViewDisplayInfo();
}
if ( event.type == EVENT_HYPER_SIZE3 ) // size 3?
{
- m_main->SetFontSize(12.0f);
+ m_main->SetFontSize(19.0f);
slider = static_cast<Ui::CSlider*>(pw->SearchControl(EVENT_STUDIO_SIZE));
- if ( slider != 0 ) slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/12.0f);
+ if ( slider != 0 ) slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/15.0f);
ViewDisplayInfo();
}
if ( event.type == EVENT_HYPER_SIZE4 ) // size 4?
{
- m_main->SetFontSize(15.0f);
+ m_main->SetFontSize(24.0f);
slider = static_cast<Ui::CSlider*>(pw->SearchControl(EVENT_STUDIO_SIZE));
- if ( slider != 0 ) slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/12.0f);
+ if ( slider != 0 ) slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/15.0f);
ViewDisplayInfo();
}
@@ -187,7 +187,7 @@ bool CDisplayInfo::EventProcess(const Event &event)
{
slider = static_cast<Ui::CSlider*>(pw->SearchControl(EVENT_STUDIO_SIZE));
if ( slider == 0 ) return false;
- m_main->SetFontSize(9.0f+slider->GetVisibleValue()*12.0f);
+ m_main->SetFontSize(9.0f+slider->GetVisibleValue()*15.0f);
ViewDisplayInfo();
}
@@ -422,7 +422,7 @@ void CDisplayInfo::StartDisplayInfo(std::string filename, int index, bool bSoluc
button->SetState(STATE_SHADOW);
slider = pw->CreateSlider(pos, dim, 0, EVENT_STUDIO_SIZE);
slider->SetState(STATE_SHADOW);
- slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/6.0f);
+ slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/15.0f);
button = pw->CreateButton(pos, dim, 61, EVENT_HYPER_COPY);
button->SetState(STATE_SHADOW);
HyperUpdate();
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp
index 6f3145f..5400265 100644
--- a/src/ui/studio.cpp
+++ b/src/ui/studio.cpp
@@ -169,7 +169,7 @@ bool CStudio::EventProcess(const Event &event)
{
slider = static_cast< CSlider* >(pw->SearchControl(EVENT_STUDIO_SIZE));
if ( slider == nullptr ) return false;
- m_main->SetFontSize(9.0f+slider->GetVisibleValue()*12.0f);
+ m_main->SetFontSize(9.0f+slider->GetVisibleValue()*15.0f);
ViewEditScript();
}
@@ -636,7 +636,7 @@ void CStudio::StartEditScript(CScript *script, std::string name, int rank)
button->SetState(STATE_SHADOW);
slider = pw->CreateSlider(pos, dim, 0, EVENT_STUDIO_SIZE);
slider->SetState(STATE_SHADOW);
- slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/6.0f);
+ slider->SetVisibleValue((m_main->GetFontSize()-9.0f)/15.0f);
pw->CreateGroup(pos, dim, 19, EVENT_LABEL1); // SatCom logo
button = pw->CreateButton(pos, dim, 128+57, EVENT_STUDIO_TOOL);
button->SetState(STATE_SHADOW);