Add hotkeys, expand description

description improvements
ihhub · Jan 13, 2025 · 4bc6e70 · 4bc6e70
1 parent 560c352
commit 4bc6e70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/fheroes2/battle/battle_interface.cpp b/src/fheroes2/battle/battle_interface.cpp
@@ -2878,7 +2878,7 @@ void Battle::Interface::HumanBattleTurn( const Unit & unit, Actions & actions, s
             OpenAutoModeDialog( unit, actions );
         }
         else if ( le.isMouseRightButtonPressed() ) {
-            fheroes2::showStandardTextMessage( _( "Automatic Battle" ), _( "Choose between solving the battle through Auto Combat or Auto Resolve." ), Dialog::ZERO );
+            fheroes2::showStandardTextMessage( _( "Automatic Battle" ), _( "Choose whether to fight out the battle through Auto Combat or Auto Resolve." ), Dialog::ZERO );
         }
     }
     else if ( le.isMouseCursorPosInArea( _buttonSettings.area() ) ) {
@@ -3276,10 +3276,10 @@ void Battle::Interface::OpenAutoModeDialog( const Unit & unit, Actions & actions
         if ( le.MouseClickLeft( buttonCancel.area() ) || Game::HotKeyPressEvent( Game::HotKeyEvent::DEFAULT_CANCEL ) ) {
             return;
         }
-        if ( le.MouseClickLeft( buttonAutoCombat.area() ) ) {
+        if ( le.MouseClickLeft( buttonAutoCombat.area() ) || Game::HotKeyPressEvent( Game::HotKeyEvent::BATTLE_AUTO_SWITCH ) ) {
             EventStartAutoBattle( unit, actions );
         }
-        else if ( le.MouseClickLeft( buttonAutoResolve.area() ) ) {
+        else if ( le.MouseClickLeft( buttonAutoResolve.area() ) || Game::HotKeyPressEvent( Game::HotKeyEvent::BATTLE_AUTO_FINISH ) ) {
             EventAutoFinish( actions );
         }
         if ( !actions.empty() ) {
@@ -3292,7 +3292,7 @@ void Battle::Interface::OpenAutoModeDialog( const Unit & unit, Actions & actions
         else if ( le.isMouseRightButtonPressedInArea( buttonAutoCombat.area() ) ) {
             std::string msg = _( "Allows the computer to fight out the battle for you." );
             msg += "\n\n";
-            msg += _( "autoCombat|This can be interrupted at any time by pressing the Auto Combat hotkey, or by a right- or left-click." );
+            msg += _( "autoCombat|This can be interrupted at any point by either pressing the Auto Combat hotkey or the default cancel key, or by right- or left-clicking anywhere." );
             fheroes2::showStandardTextMessage( _( "Auto Combat" ), msg, Dialog::ZERO );
         }
         else if ( le.isMouseRightButtonPressedInArea( buttonAutoResolve.area() ) ) {

diff --git a/src/fheroes2/gui/ui_button.cpp b/src/fheroes2/gui/ui_button.cpp
@@ -778,7 +778,7 @@ namespace fheroes2
         const int32_t textHeight = releasedText.height( textAreaWidth );
         assert( textHeight > 0 );
 
-        // Add extra y margin for multilined texts on normal buttons
+        // Add extra y-margin for multi-lined texts on normal buttons.
         if ( ( emptyButtonIcnID == ICN::EMPTY_EVIL_BUTTON || emptyButtonIcnID == ICN::EMPTY_GOOD_BUTTON ) && textHeight > 17 ) {
             textAreaMargins.y += 16;
         }