Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified Button Layout to be similar to OG #9385

Merged
merged 12 commits into from
Jan 4, 2025
Merged

Modified Button Layout to be similar to OG #9385

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b8774ae
Refactored building info dialog to make use of ButtonGroup
felix642 Dec 25, 2024
8aa872c
Refactored buy hero dialog to use ButtonGroup
felix642 Dec 25, 2024
fa7957a
Refactored buy boat dialog to make use of ButtonGroup
felix642 Dec 25, 2024
7cd9882
Modified Button Group Layout to be similar to OG
felix642 Dec 25, 2024
fb583c0
Code format
felix642 Dec 25, 2024
9c8b94b
Clang-tidy
felix642 Dec 26, 2024
5e2852c
Removed useless fp conversion
felix642 Dec 26, 2024
a6c4f2b
IWYU
felix642 Dec 26, 2024
ec32071
Code format
felix642 Dec 26, 2024
b6cd087
Code review
felix642 Jan 2, 2025
a06e2f2
Merge remote-tracking branch 'origin/master' into I1355-button-layout
felix642 Jan 2, 2025
5929d73
Copyright headers
felix642 Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 7 additions & 29 deletions src/fheroes2/castle/buildinginfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include "castle_building_info.h"
#include "cursor.h"
#include "dialog.h"
#include "game_hotkeys.h"
#include "icn.h"
#include "localevent.h"
#include "m82.h"
Expand Down Expand Up @@ -543,42 +542,21 @@ bool BuildingInfo::DialogBuyBuilding( bool buttons ) const
return false;
}

const bool isEvilInterface = Settings::Get().isEvilInterfaceEnabled();
const int buttonOkayIcnID = isEvilInterface ? ICN::UNIFORM_EVIL_OKAY_BUTTON : ICN::UNIFORM_GOOD_OKAY_BUTTON;

pos.x = dialogRoi.x;
pos.y = dialogRoi.y + dialogRoi.height - fheroes2::AGG::GetICN( buttonOkayIcnID, 0 ).height();

fheroes2::Button buttonOkay( pos.x, pos.y, buttonOkayIcnID, 0, 1 );

const int buttonCancelIcnID = isEvilInterface ? ICN::UNIFORM_EVIL_CANCEL_BUTTON : ICN::UNIFORM_GOOD_CANCEL_BUTTON;

pos.x = dialogRoi.x + dialogRoi.width - fheroes2::AGG::GetICN( buttonCancelIcnID, 0 ).width();
pos.y = dialogRoi.y + dialogRoi.height - fheroes2::AGG::GetICN( buttonCancelIcnID, 0 ).height();
fheroes2::Button buttonCancel( pos.x, pos.y, buttonCancelIcnID, 0, 1 );
fheroes2::ButtonGroup buttonGroup( dialogRoi, Dialog::OK | Dialog::CANCEL );
fheroes2::ButtonBase & buttonOkay = buttonGroup.button( 0 );
const fheroes2::ButtonBase & buttonCancel = buttonGroup.button( 1 );

if ( BuildingStatus::ALLOW_BUILD != castle.CheckBuyBuilding( _buildingType ) ) {
buttonOkay.disable();
}

buttonOkay.draw();
buttonCancel.draw();

buttonGroup.draw();
display.render();

while ( le.HandleEvents() ) {
if ( buttonOkay.isEnabled() ) {
buttonOkay.drawOnState( le.isMouseLeftButtonPressedInArea( buttonOkay.area() ) );
}

buttonCancel.drawOnState( le.isMouseLeftButtonPressedInArea( buttonCancel.area() ) );

if ( buttonOkay.isEnabled() && ( Game::HotKeyPressEvent( Game::HotKeyEvent::DEFAULT_OKAY ) || le.MouseClickLeft( buttonOkay.area() ) ) ) {
return true;
}

if ( Game::HotKeyPressEvent( Game::HotKeyEvent::DEFAULT_CANCEL ) || le.MouseClickLeft( buttonCancel.area() ) ) {
break;
const int result = buttonGroup.processEvents();
if ( result != Dialog::ZERO ) {
return result == Dialog::OK;
}

if ( le.isMouseRightButtonPressedInArea( buttonOkay.area() ) ) {
Expand Down
30 changes: 7 additions & 23 deletions src/fheroes2/castle/castle_town.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,38 +126,22 @@ int Castle::DialogBuyHero( const Heroes * hero ) const
rbs.SetPos( dialogRoi.x, pos.y + heroDescriptionText.height( fheroes2::boxAreaWidthPx ) + spacer );
rbs.Redraw();

const bool isEvilInterface = Settings::Get().isEvilInterfaceEnabled();
const int okayButtonIcnID = isEvilInterface ? ICN::UNIFORM_EVIL_OKAY_BUTTON : ICN::UNIFORM_GOOD_OKAY_BUTTON;

pos.y = dialogRoi.y + dialogRoi.height - fheroes2::AGG::GetICN( okayButtonIcnID, 0 ).height();
fheroes2::Button buttonOkay( dialogRoi.x, pos.y, okayButtonIcnID, 0, 1 );
fheroes2::ButtonGroup buttonGroup( dialogRoi, Dialog::OK | Dialog::CANCEL );
fheroes2::ButtonBase & buttonOkay = buttonGroup.button( 0 );
const fheroes2::ButtonBase & buttonCancel = buttonGroup.button( 1 );

if ( !AllowBuyHero() ) {
buttonOkay.disable();
}

const int cancelButtonIcnID = isEvilInterface ? ICN::UNIFORM_EVIL_CANCEL_BUTTON : ICN::UNIFORM_GOOD_CANCEL_BUTTON;

pos.x = dialogRoi.x + dialogRoi.width - fheroes2::AGG::GetICN( cancelButtonIcnID, 0 ).width();
pos.y = dialogRoi.y + dialogRoi.height - fheroes2::AGG::GetICN( cancelButtonIcnID, 0 ).height();
fheroes2::Button buttonCancel( pos.x, pos.y, cancelButtonIcnID, 0, 1 );

buttonOkay.draw();
buttonCancel.draw();

buttonGroup.draw();
display.render();

LocalEvent & le = LocalEvent::Get();
while ( le.HandleEvents() ) {
buttonOkay.drawOnState( le.isMouseLeftButtonPressedInArea( buttonOkay.area() ) );
buttonCancel.drawOnState( le.isMouseLeftButtonPressedInArea( buttonCancel.area() ) );

if ( buttonOkay.isEnabled() && ( le.MouseClickLeft( buttonOkay.area() ) || Game::HotKeyPressEvent( Game::HotKeyEvent::DEFAULT_OKAY ) ) ) {
return Dialog::OK;
}

if ( le.MouseClickLeft( buttonCancel.area() ) || Game::HotKeyPressEvent( Game::HotKeyEvent::DEFAULT_CANCEL ) ) {
break;
const int result = buttonGroup.processEvents();
if ( result != Dialog::ZERO ) {
return result;
}

if ( le.isMouseRightButtonPressedInArea( heroPortraitArea ) ) {
Expand Down
35 changes: 6 additions & 29 deletions src/fheroes2/dialog/dialog_buyboat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@
#include "agg_image.h"
#include "cursor.h"
#include "dialog.h" // IWYU pragma: associated
#include "game_hotkeys.h"
#include "icn.h"
#include "image.h"
#include "localevent.h"
#include "math_base.h"
#include "payment.h"
#include "resource.h"
#include "screen.h"
#include "settings.h"
#include "translations.h"
#include "ui_button.h"
#include "ui_text.h"
Expand All @@ -41,8 +39,6 @@ int Dialog::BuyBoat( bool enable )
{
fheroes2::Display & display = fheroes2::Display::instance();

const bool isEvilInterface = Settings::Get().isEvilInterfaceEnabled();

// setup cursor
const CursorRestorer cursorRestorer( true, Cursor::POINTER );

Expand Down Expand Up @@ -71,43 +67,24 @@ int Dialog::BuyBoat( bool enable )
rbs.Redraw();

// buttons
const int buttonOkayICN = isEvilInterface ? ICN::UNIFORM_EVIL_OKAY_BUTTON : ICN::UNIFORM_GOOD_OKAY_BUTTON;
dst_pt.x = box_rt.x;
dst_pt.y = box_rt.y + box_rt.height - fheroes2::AGG::GetICN( buttonOkayICN, 0 ).height();
fheroes2::Button buttonOkay( dst_pt.x, dst_pt.y, buttonOkayICN, 0, 1 );

const int buttonCancelICN = isEvilInterface ? ICN::UNIFORM_EVIL_CANCEL_BUTTON : ICN::UNIFORM_GOOD_CANCEL_BUTTON;

dst_pt.x = box_rt.x + box_rt.width - fheroes2::AGG::GetICN( buttonCancelICN, 0 ).width();
dst_pt.y = box_rt.y + box_rt.height - fheroes2::AGG::GetICN( buttonCancelICN, 0 ).height();
fheroes2::Button buttonCancel( dst_pt.x, dst_pt.y, buttonCancelICN, 0, 1 );
fheroes2::ButtonGroup buttonGroup( box_rt, Dialog::OK | Dialog::CANCEL );
fheroes2::ButtonBase & buttonOkay = buttonGroup.button( 0 );

if ( !enable ) {
buttonOkay.press();
buttonOkay.disable();
}

buttonOkay.draw();
buttonCancel.draw();

buttonGroup.draw();
display.render();

LocalEvent & le = LocalEvent::Get();

// message loop
while ( le.HandleEvents() ) {
if ( buttonOkay.isEnabled() ) {
buttonOkay.drawOnState( le.isMouseLeftButtonPressedInArea( buttonOkay.area() ) );
}

buttonCancel.drawOnState( le.isMouseLeftButtonPressedInArea( buttonCancel.area() ) );

if ( buttonOkay.isEnabled() && ( Game::HotKeyPressEvent( Game::HotKeyEvent::DEFAULT_OKAY ) || le.MouseClickLeft( buttonOkay.area() ) ) ) {
return Dialog::OK;
}

if ( Game::HotKeyPressEvent( Game::HotKeyEvent::DEFAULT_CANCEL ) || le.MouseClickLeft( buttonCancel.area() ) ) {
return Dialog::CANCEL;
const int result = buttonGroup.processEvents();
if ( result != Dialog::ZERO ) {
return result;
}
}

Expand Down
20 changes: 14 additions & 6 deletions src/fheroes2/gui/ui_button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,25 +425,33 @@ namespace fheroes2
Point offset;

switch ( buttonTypes ) {
case Dialog::YES | Dialog::NO:
offset.x = area.x;
case Dialog::YES | Dialog::NO: {
const int32_t horizontalFreeSpace = area.width - AGG::GetICN( buttonYesIcnID, 0 ).width() - AGG::GetICN( buttonNoIcnID, 0 ).width();
felix642 marked this conversation as resolved.
Show resolved Hide resolved
felix642 marked this conversation as resolved.
Show resolved Hide resolved
const int32_t padding = horizontalFreeSpace / 4;

offset.x = area.x + padding;
offset.y = area.y + area.height - AGG::GetICN( buttonYesIcnID, 0 ).height();
createButton( offset.x, offset.y, buttonYesIcnID, 0, 1, Dialog::YES );

offset.x = area.x + area.width - AGG::GetICN( buttonNoIcnID, 0 ).width();
offset.x = area.x + area.width - AGG::GetICN( buttonNoIcnID, 0 ).width() - padding;
offset.y = area.y + area.height - AGG::GetICN( buttonNoIcnID, 0 ).height();
createButton( offset.x, offset.y, buttonNoIcnID, 0, 1, Dialog::NO );
break;
}

case Dialog::OK | Dialog::CANCEL:
offset.x = area.x;
case Dialog::OK | Dialog::CANCEL: {
const int32_t horizontalFreeSpace = area.width - AGG::GetICN( buttonOkayIcnID, 0 ).width() - AGG::GetICN( buttonCancelIcnID, 0 ).width();
const int32_t padding = horizontalFreeSpace / 4;
felix642 marked this conversation as resolved.
Show resolved Hide resolved

offset.x = area.x + padding;
offset.y = area.y + area.height - AGG::GetICN( buttonOkayIcnID, 0 ).height();
createButton( offset.x, offset.y, buttonOkayIcnID, 0, 1, Dialog::OK );

offset.x = area.x + area.width - AGG::GetICN( buttonCancelIcnID, 0 ).width();
offset.x = area.x + area.width - AGG::GetICN( buttonCancelIcnID, 0 ).width() - padding;
offset.y = area.y + area.height - AGG::GetICN( buttonCancelIcnID, 0 ).height();
createButton( offset.x, offset.y, buttonCancelIcnID, 0, 1, Dialog::CANCEL );
break;
}

case Dialog::OK:
offset.x = area.x + ( area.width - AGG::GetICN( buttonOkayIcnID, 0 ).width() ) / 2;
Expand Down
Loading