diff --git a/src/GUIStuff/Elements/MovableTabList.cpp b/src/GUIStuff/Elements/MovableTabList.cpp index 0aa9408..5f41990 100644 --- a/src/GUIStuff/Elements/MovableTabList.cpp +++ b/src/GUIStuff/Elements/MovableTabList.cpp @@ -61,7 +61,7 @@ void MovableTabList::update(UpdateInputData& io, const std::vectorbackColor2; diff --git a/src/GUIStuff/Elements/SelectableButton.hpp b/src/GUIStuff/Elements/SelectableButton.hpp index 18527af..1b7a319 100644 --- a/src/GUIStuff/Elements/SelectableButton.hpp +++ b/src/GUIStuff/Elements/SelectableButton.hpp @@ -6,7 +6,7 @@ namespace GUIStuff { class SelectableButton : public Element { public: enum class DrawType { - TRANSPARENT, + TRANSPARENT_ALL, FILLED, FILLED_INVERSE, TRANSPARENT_BORDER diff --git a/src/GUIStuff/GUIManager.cpp b/src/GUIStuff/GUIManager.cpp index e83f6a3..55149b4 100644 --- a/src/GUIStuff/GUIManager.cpp +++ b/src/GUIStuff/GUIManager.cpp @@ -446,7 +446,7 @@ bool GUIManager::svg_icon_button_transparent(const std::string& id, const std::s svg_icon("1", svgPath, is || s.held || s.hovered); if(elemUpdate) elemUpdate(); - }, SelectableButton::DrawType::TRANSPARENT, isSelected); + }, SelectableButton::DrawType::TRANSPARENT_ALL, isSelected); } pop_id(); return toRet; @@ -509,7 +509,7 @@ bool GUIManager::text_button_left_transparent(const std::string& id, const std:: if(elemUpdate) elemUpdate(); } - }, SelectableButton::DrawType::TRANSPARENT, isSelected); + }, SelectableButton::DrawType::TRANSPARENT_ALL, isSelected); } return toRet; } diff --git a/src/InputManager.cpp b/src/InputManager.cpp index 30b5e5c..eb56785 100644 --- a/src/InputManager.cpp +++ b/src/InputManager.cpp @@ -327,7 +327,7 @@ void InputManager::backend_key_down_update(const SDL_KeyboardEvent& e) { set_key_down(e, KEY_TEXT_DELETE); if(text.textBox && key(KEY_TEXT_DELETE).repeat) text.do_textbox_operation_with_undo([&]() { - text.textBox->process_key_input(*text.cursor, RichText::TextBox::InputKey::DELETE, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, text.modMap); + text.textBox->process_key_input(*text.cursor, RichText::TextBox::InputKey::DEL, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, text.modMap); }); break; case SDLK_HOME: diff --git a/src/RichText/TextBox.cpp b/src/RichText/TextBox.cpp index add94f2..fb14d73 100644 --- a/src/RichText/TextBox.cpp +++ b/src/RichText/TextBox.cpp @@ -144,7 +144,7 @@ void TextBox::process_key_input(Cursor& cur, InputKey in, bool ctrl, bool shift, else cur.selectionEndPos = cur.selectionBeginPos = cur.pos = remove(cur.pos, move(ctrl ? Movement::LEFT_WORD : Movement::LEFT, cur.pos)); break; - case InputKey::DELETE: + case InputKey::DEL: if(cur.selectionBeginPos != cur.selectionEndPos) cur.selectionEndPos = cur.selectionBeginPos = cur.pos = remove(cur.selectionBeginPos, cur.selectionEndPos); else diff --git a/src/RichText/TextBox.hpp b/src/RichText/TextBox.hpp index 24cadb3..2d2c2c6 100644 --- a/src/RichText/TextBox.hpp +++ b/src/RichText/TextBox.hpp @@ -109,7 +109,7 @@ class TextBox { HOME, END, BACKSPACE, - DELETE, + DEL, ENTER, TAB, SELECT_ALL