Skip to content

Commit

Permalink
Split settings labels above and below icon (#183)
Browse files Browse the repository at this point in the history 
close #31
  • Loading branch information
@pathway27 @ihhub
pathway27 authored and ihhub committed Nov 12, 2019
1 parent ed85d31 commit c7ca997
Showing 1 changed file with 111 additions and 101 deletions.
212 changes: 111 additions & 101 deletions src/fheroes2/dialog/dialog_system.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,20 @@ int Dialog::SystemOptions(void)
cursor.Hide();
cursor.SetThemes(cursor.POINTER);

Dialog::FrameBorder frameborder((display.w() - 300 - BORDERWIDTH * 2) / 2,
(display.h() - 320 - BORDERWIDTH * 2) / 2 - (conf.QVGA() ? 25 : 0), 300, 315);
Dialog::FrameBorder frameborder( ( display.w() - 250 - BORDERWIDTH * 2 ) / 2, ( display.h() - 382 - BORDERWIDTH * 2 ) / 2 - ( conf.QVGA() ? 25 : 0 ), 288, 382 );
const Rect & area = frameborder.GetArea();

Rects rects;
const s32 posx = (area.w - 256) / 2;
rects.push_back(Rect(area.x + posx, area.y + 17, 64, 64));
rects.push_back(Rect(area.x + posx + 92, area.y + 17, 64, 64));
rects.push_back(Rect(area.x + posx + 184, area.y + 17, 64, 64));
rects.push_back(Rect(area.x + posx, area.y + 107, 64, 64));
rects.push_back(Rect(area.x + posx + 92, area.y + 107, 64, 64));
rects.push_back(Rect(area.x + posx + 184, area.y + 107, 64, 64));
rects.push_back(Rect(area.x + posx, area.y + 197, 64, 64));
rects.push_back(Rect(area.x + posx + 92, area.y + 197, 64, 64));
rects.push_back(Rect(area.x + posx + 184, area.y + 197, 64, 64));
rects.push_back( Rect( area.x + posx, area.y + 30, 64, 64 ) );
rects.push_back( Rect( area.x + posx + 92, area.y + 30, 64, 64 ) );
rects.push_back( Rect( area.x + posx + 184, area.y + 30, 64, 64 ) );
rects.push_back( Rect( area.x + posx, area.y + 140, 64, 64 ) );
rects.push_back( Rect( area.x + posx + 92, area.y + 140, 64, 64 ) );
rects.push_back( Rect( area.x + posx + 184, area.y + 140, 64, 64 ) );
rects.push_back( Rect( area.x + posx, area.y + 250, 64, 64 ) );
rects.push_back( Rect( area.x + posx + 92, area.y + 250, 64, 64 ) );
rects.push_back( Rect( area.x + posx + 184, area.y + 250, 64, 64 ) );

const Rect & rect1 = rects[0];
const Rect & rect2 = rects[1];
Expand Down Expand Up @@ -89,75 +88,74 @@ int Dialog::SystemOptions(void)
// dialog menu loop
while(btnres == Dialog::ZERO && le.HandleEvents())
{
btnres = btnGroups.QueueEventProcessing();
btnres = btnGroups.QueueEventProcessing();

// set sound volume
if(conf.Sound() && le.MouseClickLeft(rect1))
{
conf.SetSoundVolume(10 > conf.SoundVolume() ? conf.SoundVolume() + 1 : 0);
redraw = true;
Game::EnvironmentSoundMixer();
}
conf.SetSoundVolume( 10 > conf.SoundVolume() ? conf.SoundVolume() + 1 : 0 );
redraw = true;
Game::EnvironmentSoundMixer();
}

// set music volume
if(conf.Music() && le.MouseClickLeft(rect2))
{
conf.SetMusicVolume(10 > conf.MusicVolume() ? conf.MusicVolume() + 1 : 0);
redraw = true;
Music::Volume(Mixer::MaxVolume() * conf.MusicVolume() / 10);
}
conf.SetMusicVolume( 10 > conf.MusicVolume() ? conf.MusicVolume() + 1 : 0 );
redraw = true;
Music::Volume( Mixer::MaxVolume() * conf.MusicVolume() / 10 );
}

// set hero speed
if(le.MouseClickLeft(rect4))
{
conf.SetHeroesMoveSpeed(10 > conf.HeroesMoveSpeed() ? conf.HeroesMoveSpeed() + 1 : 0);
result |= 0x01;
redraw = true;
Game::UpdateHeroesMoveSpeed();
}
conf.SetHeroesMoveSpeed( 10 > conf.HeroesMoveSpeed() ? conf.HeroesMoveSpeed() + 1 : 0 );
result |= 0x01;
redraw = true;
Game::UpdateHeroesMoveSpeed();
}

// set ai speed
if(le.MouseClickLeft(rect5))
{
conf.SetAIMoveSpeed(10 > conf.AIMoveSpeed() ? conf.AIMoveSpeed() + 1 : 0);
result |= 0x01;
redraw = true;
Game::UpdateHeroesMoveSpeed();
}
conf.SetAIMoveSpeed( 10 > conf.AIMoveSpeed() ? conf.AIMoveSpeed() + 1 : 0 );
result |= 0x01;
redraw = true;
Game::UpdateHeroesMoveSpeed();
}

// set scroll speed
if(le.MouseClickLeft(rect6))
{
conf.SetScrollSpeed(SCROLL_FAST2 > conf.ScrollSpeed() ? conf.ScrollSpeed() << 1 : SCROLL_SLOW);
result |= 0x10;
redraw = true;
}
conf.SetScrollSpeed( SCROLL_FAST2 > conf.ScrollSpeed() ? conf.ScrollSpeed() << 1 : SCROLL_SLOW );
result |= 0x10;
redraw = true;
}

// set interface theme
if(le.MouseClickLeft(rect7))
{
conf.SetEvilInterface(!conf.ExtGameEvilInterface());
result |= 0x08;
redraw = true;
}
conf.SetEvilInterface( !conf.ExtGameEvilInterface() );
result |= 0x08;
redraw = true;
}

// set interface hide/show
if(le.MouseClickLeft(rect8) && !conf.QVGA())
{
conf.SetHideInterface(!conf.ExtGameHideInterface());
result |= 0x04;
redraw = true;
}

if(redraw)
{
cursor.Hide();
back2.Blit(area, display);
DrawSystemInfo(rects);
cursor.Show();
display.Flip();
redraw = false;
}
conf.SetHideInterface( !conf.ExtGameHideInterface() );
result |= 0x04;
redraw = true;
}

if ( redraw ) {
cursor.Hide();
back2.Blit( area, display );
DrawSystemInfo( rects );
cursor.Show();
display.Flip();
redraw = false;
}
}

// restore background
Expand All @@ -180,121 +178,133 @@ void Dialog::DrawSystemInfo(const Rects & rects)
Surface black(Size(65, 65), false);
black.Fill(ColorBlack);

const int textOffset = 2;

// sound
const Sprite & sprite1 = AGG::GetICN(ICN::SPANEL, conf.Sound() ? 1 : 0);
const Rect & rect1 = rects[0];
sprite1.Blit(rect1);
str = _("sound");
str.append(" ");
if(conf.Sound() && conf.SoundVolume())
str.append(GetString(conf.SoundVolume()));
str = _( "music" );
text.Set( str, Font::SMALL );
text.Blit( rect1.x + ( rect1.w - text.w() ) / 2, rect1.y - text.h() - textOffset );

if ( conf.Sound() && conf.SoundVolume() )
str = GetString( conf.SoundVolume() );
else
str.append(_("off"));
text.Set(str, Font::SMALL);
text.Blit(rect1.x + (rect1.w - text.w()) / 2, rect1.y + rect1.h + 5);
str = _( "off" );
text.Set( str, Font::SMALL );
text.Blit( rect1.x + ( rect1.w - text.w() ) / 2, rect1.h + rect1.y + textOffset );

// music
const Sprite & sprite2 = AGG::GetICN(ICN::SPANEL, conf.Music() ? 3 : 2);
const Rect & rect2 = rects[1];
sprite2.Blit(rect2);
str = _("music");
str.append(" ");
if(conf.Music() && conf.MusicVolume())
str.append(GetString(conf.MusicVolume()));
str = _( "effects" );
text.Set( str, Font::SMALL );
text.Blit( rect2.x + ( rect2.w - text.w() ) / 2, rect2.y - text.h() - textOffset );

if ( conf.Music() && conf.MusicVolume() )
str = GetString( conf.MusicVolume() );
else
str.append(_("off"));
text.Set(str);
text.Blit(rect2.x + (rect2.w - text.w()) / 2, rect2.y + rect2.h + 5);
str = _( "off" );
text.Set( str );
text.Blit( rect2.x + ( rect2.w - text.w() ) / 2, rect2.y + rect2.h + textOffset );

// unused
//const Sprite & sprite3 = AGG::GetICN(ICN::SPANEL, 17);
const Rect & rect3 = rects[2];
black.Blit(rect3, display);
str.clear();
black.Blit( rect3, display );
str = "unused";
text.Set(str);
text.Blit(rect3.x + (rect3.w - text.w()) / 2, rect3.y + rect3.h + 5);
text.Set( str );
text.Blit( rect3.x + ( rect3.w - text.w() ) / 2, rect3.y + rect3.h + textOffset );

// hero move speed
const u32 is4 = conf.HeroesMoveSpeed() ? (conf.HeroesMoveSpeed() < 9 ? (conf.HeroesMoveSpeed() < 7 ? (conf.HeroesMoveSpeed() < 4 ? 4 : 5) : 6) : 7) : 9;
const Sprite & sprite4 = AGG::GetICN(ICN::SPANEL, is4);
const Rect & rect4 = rects[3];
sprite4.Blit(rect4);
str = _("hero speed");
str.append(" ");
text.Set( str );
text.Blit( rect4.x + ( rect4.w - text.w() ) / 2, rect4.y - text.h() - textOffset );

if(conf.HeroesMoveSpeed())
str.append(GetString(conf.HeroesMoveSpeed()));
str = GetString( conf.HeroesMoveSpeed() );
else
str.append(_("off"));
text.Set(str);
text.Blit(rect4.x + (rect4.w - text.w()) / 2, rect4.y + rect4.h + 5);
str = _( "off" );
text.Set( str );
text.Blit( rect4.x + ( rect4.w - text.w() ) / 2, rect4.y + rect4.h + textOffset );

// ai move speed
const u32 is5 = conf.AIMoveSpeed() ? (conf.AIMoveSpeed() < 9 ? (conf.AIMoveSpeed() < 7 ? (conf.AIMoveSpeed() < 4 ? 4 : 5) : 6) : 7) : 9;
const Sprite & sprite5 = AGG::GetICN(ICN::SPANEL, is5);
const Rect & rect5 = rects[4];
sprite5.Blit(rect5);
str = _("ai speed");
str.append(" ");
text.Set( str );
text.Blit( rect5.x + ( rect5.w - text.w() ) / 2, rect5.y - text.h() - textOffset );

if(conf.AIMoveSpeed())
str.append(GetString(conf.AIMoveSpeed()));
str = GetString( conf.AIMoveSpeed() );
else
str.append(_("off"));
str = _( "off" );
text.Set(str);
text.Blit(rect5.x + (rect5.w - text.w()) / 2, rect5.y + rect5.h + 5);
text.Blit( rect5.x + ( rect5.w - text.w() ) / 2, rect5.y + rect5.h + textOffset );

// scroll speed
const u32 is6 = (conf.ScrollSpeed() < SCROLL_FAST2 ? (conf.ScrollSpeed() < SCROLL_FAST1 ? (conf.ScrollSpeed() < SCROLL_NORMAL ? 4 : 5) : 6) : 7);
const Sprite & sprite6 = AGG::GetICN(ICN::SPANEL, is6);
const Rect & rect6 = rects[5];
sprite6.Blit(rect6);
str = _("scroll speed");
str.append(" ");
str.append(GetString(conf.ScrollSpeed()));
text.Set(str);
text.Blit(rect6.x + (rect6.w - text.w()) / 2, rect6.y + rect6.h + 5);
text.Blit( rect6.x + ( rect6.w - text.w() ) / 2, rect5.y - text.h() - textOffset );

str = GetString( conf.ScrollSpeed() );
text.Set( str );
text.Blit( rect6.x + ( rect6.w - text.w() ) / 2, rect6.y + rect6.h + textOffset );

// interface themes
const Sprite & sprite7 = AGG::GetICN(ICN::SPANEL, (conf.ExtGameEvilInterface() ? 17 : 16));
const Rect & rect7 = rects[6];
sprite7.Blit(rect7);
str.clear();
str = _("Interface");
str += ": ";
text.Set( str );
text.Blit( rect7.x + ( rect7.w - text.w() ) / 2, rect7.y - text.h() - textOffset );

if(conf.ExtGameEvilInterface())
str += _("Evil");
str = _( "Evil" );
else
str += _("Good");
text.Set(str);
text.Blit(rect7.x + (rect7.w - text.w()) / 2, rect7.y + rect7.h + 5);
str = _( "Good" );
text.Set( str );
text.Blit( rect7.x + ( rect7.w - text.w() ) / 2, rect7.y + rect7.h + textOffset );

// interface show/hide
const Sprite & sprite8 = AGG::GetICN(ICN::SPANEL, 16);
const Sprite & sprite81 = AGG::GetICN(ICN::ESPANEL, 4);
const Rect & rect8 = rects[7];
str.clear();
str = _("Interface");
str += ": ";
text.Set( str );
text.Blit( rect8.x + ( rect8.w - text.w() ) / 2, rect8.y - text.h() - textOffset );

if(conf.ExtGameHideInterface())
{
sprite81.Blit(rect8, display);
str += _("Hide");
sprite81.Blit( rect8, display );
str = _( "Hide" );
}
else
{
sprite8.Blit(rect8, display);
sprite81.Blit(Rect(13, 13, 38, 38), rect8.x + 13, rect8.y + 13);
str += _("Show");
sprite8.Blit( rect8, display );
sprite81.Blit( Rect( 13, 13, 38, 38 ), rect8.x + 13, rect8.y + 13 );
str = _( "Show" );
}
text.Set(str);
text.Blit(rect8.x + (rect8.w - text.w()) / 2, rect8.y + rect8.h + 5);
text.Set( str );
text.Blit( rect8.x + ( rect8.w - text.w() ) / 2, rect8.y + rect8.h + textOffset );

// unused
//const Sprite & sprite9 = AGG::GetICN(ICN::SPANEL, 17);
const Rect & rect9 = rects[8];
black.Blit(rect9, display);
str.clear();
black.Blit( rect9, display );
str = "unused";
text.Set(str);
text.Blit(rect9.x + (rect9.w - text.w()) / 2, rect9.y + rect9.h + 5);
text.Set( str );
text.Blit( rect9.x + ( rect9.w - text.w() ) / 2, rect9.y + rect9.h + textOffset );
}

0 comments on commit c7ca997

Please sign in to comment.