diff --git a/src/gui/interface/Label.cpp b/src/gui/interface/Label.cpp index 11512143b4..c7da89cbec 100644 --- a/src/gui/interface/Label.cpp +++ b/src/gui/interface/Label.cpp @@ -233,6 +233,11 @@ void Label::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool al { copySelection(); } + if(ctrl && key == 'a') + { + selectAll(); + return; + } } void Label::OnMouseMoved(int localx, int localy, int dx, int dy) @@ -280,6 +285,13 @@ void Label::ClearSelection() updateSelection(); } +void Label::selectAll() +{ + selectionIndex0 = 0; + selectionIndex1 = text.length(); + updateSelection(); +} + void Label::updateSelection() { std::string currentText; diff --git a/src/gui/interface/Label.h b/src/gui/interface/Label.h index 8e9825b6b7..fe6e4a2280 100644 --- a/src/gui/interface/Label.h +++ b/src/gui/interface/Label.h @@ -54,6 +54,7 @@ namespace ui virtual bool HasSelection(); virtual void ClearSelection(); + virtual void selectAll(); virtual void AutoHeight(); void SetTextColour(Colour textColour) { this->textColour = textColour; } diff --git a/src/gui/interface/Textbox.cpp b/src/gui/interface/Textbox.cpp index fe646421e8..452be8a599 100644 --- a/src/gui/interface/Textbox.cpp +++ b/src/gui/interface/Textbox.cpp @@ -182,13 +182,6 @@ void Textbox::cutSelection() actionCallback->TextChangedCallback(this); } -void Textbox::selectAll() -{ - selectionIndex0 = 0; - selectionIndex1 = text.length(); - updateSelection(); -} - void Textbox::pasteIntoSelection() { std::string newText = format::CleanString(ClipboardPull(), true, true, inputType != Multiline, inputType == Number || inputType == Numeric); diff --git a/src/gui/interface/Textbox.h b/src/gui/interface/Textbox.h index 49eaac1efe..f1f62aa1b3 100644 --- a/src/gui/interface/Textbox.h +++ b/src/gui/interface/Textbox.h @@ -69,7 +69,6 @@ class Textbox : public Label std::string backingText; std::string placeHolder; - virtual void selectAll(); virtual void cutSelection(); virtual void pasteIntoSelection(); };