Commit 742b8fe1 authored by Gerhard Stein's avatar Gerhard Stein

More options in Gamelauncher

parent 33a49d81
......@@ -29,9 +29,6 @@ GameMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f),
style )
{
if(style != GsControl::Style::NONE)
{
mpMenuDialog->addControl(new GameButton( "Display",
new OpenMenuEvent( new DisplaySettings(Style()) ),
style ) );
......@@ -39,11 +36,12 @@ GameMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f),
mpMenuDialog->addControl(new GameButton( "Audio",
new OpenMenuEvent( new CAudioSettings(Style()) ),
style ) );
mpMenuDialog->addControl(new GameButton( "Video",
new OpenMenuEvent( new CVideoSettings(Style()) ),
style ) );
}
mpMenuDialog->addControl(new GameButton( "Options",
new OpenMenuEvent( new COptions(Style()) ),
......
......@@ -100,10 +100,10 @@ void ComboSelection::processRender(const GsRect<float> &RectDispCoordFloat)
// Now lets draw the text of the list control
GsFont &Font = gGraphics.getFont(mFontID);
Font.drawFont( blitsfc.getSDLSurface(), mText, lRect.x+24, lRect.y, false );
Font.drawFont( blitsfc.getSDLSurface(), ":", lRect.x+24+mText.size()*8, lRect.y, false );
const std::string text = (*mOLCurrent);
Font.drawFont( blitsfc.getSDLSurface(), text, lRect.x+24+(mText.size()+2)*8, lRect.y, false );
std::string text = mText + ": " + (*mOLCurrent);
Font.drawFont( blitsfc.getSDLSurface(), text, lRect.x+40, lRect.y, false );
drawTwirl(lRect);
}
}
......
......@@ -60,6 +60,35 @@ void NumberControl::processLogic()
}
}
void NumberControl::drawNoStyle(SDL_Rect& lRect)
{
// Now lets draw the text of the list control
GsFont &Font = gGraphics.getFont(mFontID);
std::string text = mText + ":";
SDL_Surface *blitsfc = gVideoDriver.getBlitSurface();
/*
if(mSlider)
{
text += sliderStr();
}
else*/
{
text += (mDecSel) ? "\025" : " ";
text += itoa(mValue);
if(mIncSel)
text += static_cast<char>(17);
else
text += " ";
}
Font.drawFont( blitsfc, text, lRect.x+40, lRect.y, false );
drawTwirl(lRect);
}
void NumberControl::processRender(const GsRect<float> &RectDispCoordFloat)
{
// Transform to the display coordinates
......
......@@ -19,6 +19,8 @@ public:
void processLogic();
void drawNoStyle(SDL_Rect& lRect);
void processRender(const GsRect<float> &RectDispCoordFloat);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment