From 9a0057c89091384c4bd71dcb6bce99d83d0d0dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Mon, 29 Jan 2024 00:05:22 -0300 Subject: [PATCH] Minor clean up. --- include/eepp/ui/base.hpp | 3 - .../eepp/ui/tools/uicodeeditorsplitter.hpp | 2 + include/eepp/ui/uiconsole.hpp | 1 + include/eepp/ui/uidatabind.hpp | 1 + include/eepp/window/input.hpp | 1 - include/eepp/window/inputhelper.hpp | 15 -- projects/linux/ee.creator.user | 2 +- projects/linux/ee.files | 2 - src/eepp/ui/css/drawableimageparser.cpp | 1 + src/eepp/ui/css/stylesheet.cpp | 1 + src/eepp/ui/css/stylesheetproperty.cpp | 1 + src/eepp/ui/css/stylesheetspecification.cpp | 1 + src/eepp/ui/doc/syntaxdefinitionmanager.cpp | 35 ++--- src/eepp/ui/uimessagebox.cpp | 4 + src/eepp/ui/uitextedit.cpp | 1 + src/eepp/ui/uitheme.cpp | 1 + src/eepp/ui/uitooltip.cpp | 1 + src/eepp/window/inputhelper.cpp | 144 ------------------ src/tools/ecode/plugins/git/gitplugin.cpp | 7 + src/tools/ecode/settingsmenu.cpp | 2 +- 20 files changed, 42 insertions(+), 184 deletions(-) delete mode 100644 include/eepp/window/inputhelper.hpp delete mode 100644 src/eepp/window/inputhelper.cpp diff --git a/include/eepp/ui/base.hpp b/include/eepp/ui/base.hpp index 8697c5382..3bf261b43 100644 --- a/include/eepp/ui/base.hpp +++ b/include/eepp/ui/base.hpp @@ -19,9 +19,6 @@ using namespace EE::Math; #include using namespace EE::System; -#include -using namespace EE::Window; - #include #include using namespace EE::Graphics; diff --git a/include/eepp/ui/tools/uicodeeditorsplitter.hpp b/include/eepp/ui/tools/uicodeeditorsplitter.hpp index 56ca25cc9..e11a6ea35 100644 --- a/include/eepp/ui/tools/uicodeeditorsplitter.hpp +++ b/include/eepp/ui/tools/uicodeeditorsplitter.hpp @@ -7,6 +7,8 @@ #include #include +#include + using namespace EE::UI::Doc; namespace EE { namespace UI { namespace Tools { diff --git a/include/eepp/ui/uiconsole.hpp b/include/eepp/ui/uiconsole.hpp index e3ca9de7e..24f11a6d8 100644 --- a/include/eepp/ui/uiconsole.hpp +++ b/include/eepp/ui/uiconsole.hpp @@ -3,6 +3,7 @@ #include #include +#include #include #include #include diff --git a/include/eepp/ui/uidatabind.hpp b/include/eepp/ui/uidatabind.hpp index 73f54a577..cb7ac073f 100644 --- a/include/eepp/ui/uidatabind.hpp +++ b/include/eepp/ui/uidatabind.hpp @@ -1,6 +1,7 @@ #ifndef EE_UI_UIDATABIND_HPP #define EE_UI_UIDATABIND_HPP +#include #include #include #include diff --git a/include/eepp/window/input.hpp b/include/eepp/window/input.hpp index 4264c4808..672f3e5d9 100644 --- a/include/eepp/window/input.hpp +++ b/include/eepp/window/input.hpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/include/eepp/window/inputhelper.hpp b/include/eepp/window/inputhelper.hpp deleted file mode 100644 index 1dbd3e1f6..000000000 --- a/include/eepp/window/inputhelper.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef EE_INPUT_HELPER_HPP -#define EE_INPUT_HELPER_HPP - -#include - -namespace EE { namespace Window { - -class InputHelper { - public: - static Uint32 EE_API convertKeyCharacter( const Uint32& KeyCode, const Uint16& Unicode ); -}; - -}} // namespace EE::Window - -#endif diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index 4c2e7d5e9..ed4d21b2d 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/projects/linux/ee.files b/projects/linux/ee.files index 43774063d..74c1e7f83 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -452,7 +452,6 @@ ../../include/eepp/window.hpp ../../include/eepp/window/inputevent.hpp ../../include/eepp/window/inputfinger.hpp -../../include/eepp/window/inputhelper.hpp ../../include/eepp/window/inputmethod.hpp ../../include/eepp/window/input.hpp ../../include/eepp/window/joycodes.hpp @@ -1125,7 +1124,6 @@ ../../src/eepp/window/engine.cpp ../../src/eepp/window/input.cpp ../../src/eepp/window/inputfinger.cpp -../../src/eepp/window/inputhelper.cpp ../../src/eepp/window/inputmethod.cpp ../../src/eepp/window/joystick.cpp ../../src/eepp/window/joystickmanager.cpp diff --git a/src/eepp/ui/css/drawableimageparser.cpp b/src/eepp/ui/css/drawableimageparser.cpp index c799c2a16..107a2d36e 100644 --- a/src/eepp/ui/css/drawableimageparser.cpp +++ b/src/eepp/ui/css/drawableimageparser.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/src/eepp/ui/css/stylesheet.cpp b/src/eepp/ui/css/stylesheet.cpp index 0cfd3734b..5678916cd 100644 --- a/src/eepp/ui/css/stylesheet.cpp +++ b/src/eepp/ui/css/stylesheet.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include #include diff --git a/src/eepp/ui/css/stylesheetproperty.cpp b/src/eepp/ui/css/stylesheetproperty.cpp index 919f9fb73..985dcdefb 100644 --- a/src/eepp/ui/css/stylesheetproperty.cpp +++ b/src/eepp/ui/css/stylesheetproperty.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include diff --git a/src/eepp/ui/css/stylesheetspecification.cpp b/src/eepp/ui/css/stylesheetspecification.cpp index f8fa4f6e6..50f80578f 100644 --- a/src/eepp/ui/css/stylesheetspecification.cpp +++ b/src/eepp/ui/css/stylesheetspecification.cpp @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp index e6de8b633..d54657aa3 100644 --- a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp +++ b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp @@ -1,6 +1,8 @@ #include #include +#include #include +#include #include #include #include @@ -1124,23 +1126,22 @@ static void addCMake() { for ( const auto& keyword : cmake_literals ) cmake_symbols[keyword] = "literal"; - SyntaxDefinitionManager::instance()->add( - { "CMake", - { "%.cmake$", "CMakeLists.txt$" }, - { - { { "#", "[^\\]\n" }, "comment" }, - { { "\"", "\"", "\\" }, "string" }, - { { "'", "'", "\\" }, "string" }, - { { "[%a_][%w_]*%s?%f[(]" }, "function" }, - { { "CMAKE_[%w%d_]+" }, "keyword" }, - { { "CTEST_[%w%d_]+" }, "keyword" }, - { { "%u[%u%d_]*_[%u%d_]+" }, "keyword" }, - { { "%${[%a_][%w_]*%}" }, "keyword2" }, - { { "[%a_][%w_]*" }, "symbol" }, - }, - std::move( cmake_symbols ), - "//", - { "^cmake_minimum_required.*%c" } } ); + SyntaxDefinitionManager::instance()->add( { "CMake", + { "%.cmake$", "CMakeLists.txt$" }, + { + { { "#", "[^\\]\n" }, "comment" }, + { { "\"", "\"", "\\" }, "string" }, + { { "'", "'", "\\" }, "string" }, + { { "[%a_][%w_]*%s?%f[(]" }, "function" }, + { { "CMAKE_[%w%d_]+" }, "keyword" }, + { { "CTEST_[%w%d_]+" }, "keyword" }, + { { "%u[%u%d_]*_[%u%d_]+" }, "keyword" }, + { { "%${[%a_][%w_]*%}" }, "keyword2" }, + { { "[%a_][%w_]*" }, "symbol" }, + }, + std::move( cmake_symbols ), + "//", + { "^cmake_minimum_required.*%c" } } ); } static void addJSX() { diff --git a/src/eepp/ui/uimessagebox.cpp b/src/eepp/ui/uimessagebox.cpp index a3b888dd7..6bc55d171 100644 --- a/src/eepp/ui/uimessagebox.cpp +++ b/src/eepp/ui/uimessagebox.cpp @@ -52,6 +52,10 @@ UIMessageBox::UIMessageBox( const Type& type, const String& message, const Uint3 ->setLayoutMargin( Rectf( 0, 4, 0, 4 ) ) ->setSize( PixelDensity::dpToPx( Vector2f{ 400, 100 } ) ) ->setParent( vlay ); + mTextEdit->getDocument().setCommand( "complete-edit", + [this] { sendCommonEvent( Event::OnConfirm ); } ); + mTextEdit->getKeyBindings().addKeybind( { KEY_RETURN, KeyMod::getDefaultModifier() }, + "complete-edit" ); } UILinearLayout* hlay = UILinearLayout::NewHorizontal(); diff --git a/src/eepp/ui/uitextedit.cpp b/src/eepp/ui/uitextedit.cpp index b27516d93..43eb35d35 100644 --- a/src/eepp/ui/uitextedit.cpp +++ b/src/eepp/ui/uitextedit.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include diff --git a/src/eepp/ui/uitheme.cpp b/src/eepp/ui/uitheme.cpp index 8f18faf81..6022d08a0 100644 --- a/src/eepp/ui/uitheme.cpp +++ b/src/eepp/ui/uitheme.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/eepp/ui/uitooltip.cpp b/src/eepp/ui/uitooltip.cpp index 28ff3b6f6..3167ded77 100644 --- a/src/eepp/ui/uitooltip.cpp +++ b/src/eepp/ui/uitooltip.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include diff --git a/src/eepp/window/inputhelper.cpp b/src/eepp/window/inputhelper.cpp deleted file mode 100644 index f8113f85f..000000000 --- a/src/eepp/window/inputhelper.cpp +++ /dev/null @@ -1,144 +0,0 @@ -#include - -namespace EE { namespace Window { - -Uint32 InputHelper::convertKeyCharacter( const Uint32& KeyCode, const Uint16& Unicode ) { - Uint32 value = 0; - - if ( Unicode < 255 ) { - value = Unicode; - } - - if ( String::isCharacter( value ) ) { - return value; - } - - switch ( KeyCode ) { - case KEY_TAB: - value = KEY_TAB; - break; - case KEY_LALT: - value = KEY_LALT; - break; - case KEY_RALT: - value = KEY_RALT; - break; - case KEY_LSHIFT: - value = KEY_LSHIFT; - break; - case KEY_RSHIFT: - value = KEY_RSHIFT; - break; - case KEY_LCTRL: - value = KEY_RSHIFT; - break; - case KEY_RCTRL: - value = KEY_LCTRL; - break; - case KEY_BACKSPACE: - value = KEY_BACKSPACE; - break; - case KEY_PAUSE: - value = KEY_PAUSE; - break; - case KEY_SPACE: - value = KEY_SPACE; - break; - case KEY_ESCAPE: - value = KEY_ESCAPE; - break; - case KEY_DELETE: - value = KEY_DELETE; - break; - case KEY_INSERT: - value = KEY_INSERT; - break; - case KEY_HOME: - value = KEY_HOME; - break; - case KEY_END: - value = KEY_END; - break; - case KEY_PAGEUP: - value = KEY_PAGEUP; - break; - case KEY_PAGEDOWN: - value = KEY_PAGEDOWN; - break; - case KEY_F1: - value = KEY_F1; - break; - case KEY_F2: - value = KEY_F2; - break; - case KEY_F3: - value = KEY_F3; - break; - case KEY_F4: - value = KEY_F4; - break; - case KEY_F5: - value = KEY_F5; - break; - case KEY_F6: - value = KEY_F6; - break; - case KEY_F7: - value = KEY_F7; - break; - case KEY_F8: - value = KEY_F8; - break; - case KEY_F9: - value = KEY_F9; - break; - case KEY_F10: - value = KEY_F10; - break; - case KEY_F11: - value = KEY_F11; - break; - case KEY_F12: - value = KEY_F12; - break; - case KEY_F13: - value = KEY_F13; - break; - case KEY_F14: - value = KEY_F14; - break; - case KEY_F15: - value = KEY_F15; - break; - case KEY_CAPSLOCK: - value = KEY_CAPSLOCK; - break; - case KEY_MODE: - value = KEY_MODE; - break; - case KEY_UP: - value = KEY_UP; - break; - case KEY_DOWN: - value = KEY_DOWN; - break; - case KEY_LEFT: - value = KEY_LEFT; - break; - case KEY_RIGHT: - value = KEY_RIGHT; - break; - case KEY_RETURN: - value = KEY_RETURN; - break; - case KEY_KP_ENTER: - value = KEY_KP_ENTER; - break; - default: - break; - } - - return value; -} - -}} // namespace EE::Window diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp index 739a1244c..566bdb041 100644 --- a/src/tools/ecode/plugins/git/gitplugin.cpp +++ b/src/tools/ecode/plugins/git/gitplugin.cpp @@ -1244,6 +1244,13 @@ void GitPlugin::buildSidePanelTab() { break; case KEY_F2: branchRename( branch ); + break; + case KEY_DELETE: + if ( branch.type == Git::RefType::Stash ) + stashDrop( branch ); + else if ( branch.type == Git::RefType::Head ) + branchDelete( branch ); + break; default: break; } diff --git a/src/tools/ecode/settingsmenu.cpp b/src/tools/ecode/settingsmenu.cpp index 410e0a9a2..c9576e842 100644 --- a/src/tools/ecode/settingsmenu.cpp +++ b/src/tools/ecode/settingsmenu.cpp @@ -143,7 +143,7 @@ void SettingsMenu::createSettingsMenu( App* app ) { } ); mApp->updateRecentFiles(); mApp->updateRecentFolders(); - Log::info( "Settings Menu took: %.2f ms", clock.getElapsedTime().asMilliseconds() ); + Log::info( "Settings Menu took: %s", clock.getElapsedTime().toString() ); } UIMenu* SettingsMenu::createFileTypeMenu() {