From 18dfd6de8635263d89209916ea416d51bb4cff35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Sun, 11 Oct 2020 21:13:13 +0200 Subject: [PATCH] Copy all text in Label, Textbox, etc. if none is selected (fixes #720) This is more in line with what Cut does in Textboxes when nothing is selected. --- src/gui/interface/Label.cpp | 4 ++++ src/gui/interface/Textbox.cpp | 19 ------------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/gui/interface/Label.cpp b/src/gui/interface/Label.cpp index 30265e7ae..1dd737fae 100644 --- a/src/gui/interface/Label.cpp +++ b/src/gui/interface/Label.cpp @@ -113,6 +113,10 @@ void Label::copySelection() { ClipboardPush(format::CleanString(text.Between(selectionIndexL.raw_index, selectionIndexH.raw_index), false, true, false).ToUtf8()); } + else + { + ClipboardPush(format::CleanString(text, false, true, false).ToUtf8()); + } } void Label::OnMouseUp(int x, int y, unsigned button) diff --git a/src/gui/interface/Textbox.cpp b/src/gui/interface/Textbox.cpp index e19a8f0a3..24d741063 100644 --- a/src/gui/interface/Textbox.cpp +++ b/src/gui/interface/Textbox.cpp @@ -503,25 +503,6 @@ void Textbox::OnTextInput(String text) void Textbox::OnMouseClick(int x, int y, unsigned button) { - if (button == SDL_BUTTON_RIGHT) - { - if (HasSelection()) - { - menu->RemoveItem(0); - menu->RemoveItem(1); - menu->RemoveItem(2); - menu->AddItem(ContextMenuItem("Cut", 1, true)); - menu->AddItem(ContextMenuItem("Copy", 0, true)); - menu->AddItem(ContextMenuItem("Paste", 2, true)); - } - else - { - menu->RemoveItem(0); - menu->RemoveItem(1); - menu->RemoveItem(2); - menu->AddItem(ContextMenuItem("Paste", 2, true)); - } - } if (button != SDL_BUTTON_RIGHT) { mouseDown = true;