From 512a237f391cdcc0394bb70ab6b69c8added30e6 Mon Sep 17 00:00:00 2001 From: GenevensiS <66968533+G-e-n-e-v-e-n-s-i-S@users.noreply.github.com> Date: Fri, 5 Jun 2026 02:45:56 +0200 Subject: [PATCH] fix keywords panel --- CMakeLists.txt | 7 +++---- src/gui/control/text_ctrl.cpp | 3 ++- src/gui/set/keywords_panel.cpp | 35 ++++++++++++++++++---------------- src/util/rotation.cpp | 2 +- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index daf7cd59..543242c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,10 +27,9 @@ if( NOT HUNSPELL_FOUND ) endif() endif() -# You will most likely get a message about being unable to open hunspell-1.7.lib because pkgconf forgets to add the actual path to -# HUNSPELL_LIBRARIES. If so, uncomment the below line and point it to the correct vcpkg root folder/library. (For debug builds, add "debug\\" just before "lib\\") +# You will most likely get a message about being unable to open hunspell-1.7.lib because pkgconf forgets to add the actual path to HUNSPELL_LIBRARIES. +# If so, uncomment the below line and point it to the correct vcpkg root folder/library. (For debug builds, add "debug\\" just before "lib\\") #set(HUNSPELL_LIBRARIES "C:\\PATH\\TO\\ROOT\\vcpkg\\installed\\${VCPKG_TARGET_TRIPLET}\\lib\\hunspell-1.7.lib") -message("-- Does this have a full path? If not, and it's just a file name, it's broken: Found Hunspell at ${HUNSPELL_LIBRARIES}") include_directories("${PROJECT_BINARY_DIR}/src") include_directories("${PROJECT_SOURCE_DIR}/src") @@ -143,4 +142,4 @@ endif() include(test/tests.cmake) # Debug Message -message("-- Does this have a full path? If not, and it's just a file name, it's broken: Found Hunspell at ${HUNSPELL_LIBRARIES}") +message("-- Does this have a full path? If not, and it's just a file name, it's broken: ${HUNSPELL_LIBRARIES}") diff --git a/src/gui/control/text_ctrl.cpp b/src/gui/control/text_ctrl.cpp index 041d41b3..b55cf290 100644 --- a/src/gui/control/text_ctrl.cpp +++ b/src/gui/control/text_ctrl.cpp @@ -58,7 +58,8 @@ void TextCtrl::updateSize() { ValueViewer& viewer = *viewers.front(); viewer.bounding_box.width = cs.GetWidth() - 2; viewer.bounding_box.height = cs.GetHeight() - 2; - viewers.front()->getEditor()->determineSize(true); + viewers.front()->getEditor()->determineSize(true); + InvalidateBestSize(); } void TextCtrl::setValue(String* value, bool untagged) { diff --git a/src/gui/set/keywords_panel.cpp b/src/gui/set/keywords_panel.cpp index 0540154c..0c73c682 100644 --- a/src/gui/set/keywords_panel.cpp +++ b/src/gui/set/keywords_panel.cpp @@ -60,29 +60,32 @@ void KeywordsPanel::initControls() { sp = new wxBoxSizer(wxVERTICAL); sp->Add(fixed, 0, wxEXPAND); sp->Show(fixed,false); wxSizer* s1 = new wxBoxSizer(wxVERTICAL); - s1->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("keyword")+_(":")), 0, wxTOP, 2); - s1->Add(keyword, 1, wxEXPAND | wxTOP, 2); - s1->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("mode")+_(":")), 0, wxTOP, 2); - s1->Add(mode, 0, wxEXPAND | wxTOP, 2); + s1->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("keyword")+_(":")), 0, wxTOP | wxLEFT, 4); + s1->Add(keyword, 0, wxEXPAND | wxTOP | wxLEFT, 4); sp->Add(s1, 0, wxEXPAND | wxRIGHT, 4); - sp->Add(new wxStaticLine(panel), 0, wxEXPAND | wxTOP | wxBOTTOM, 8); + sp->Add(new wxStaticLine(panel), 0, wxEXPAND | wxTOP | wxBOTTOM, 16); + wxSizer* s9 = new wxBoxSizer(wxVERTICAL); + s9->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("mode")+_(":")), 0, wxTOP | wxLEFT, 4); + s9->Add(mode, 0, wxEXPAND | wxTOP | wxLEFT, 4); + sp->Add(s9, 0, wxEXPAND | wxRIGHT, 4); + sp->Add(new wxStaticLine(panel), 0, wxEXPAND | wxTOP | wxBOTTOM, 16); wxSizer* s2 = new wxBoxSizer(wxVERTICAL); - s2->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("match")+_(":")), 0); - s2->Add(match, 1, wxEXPAND | wxTOP, 2); - s2->Add(add_param, 0, wxALIGN_LEFT | wxTOP, 2); + s2->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("match")+_(":")), 0, wxTOP | wxLEFT, 4); + s2->Add(match, 0, wxEXPAND | wxTOP | wxLEFT, 4); + s2->Add(add_param, 0, wxALIGN_LEFT | wxTOP | wxLEFT, 4); sp->Add(s2, 0, wxEXPAND | wxRIGHT, 4); - sp->Add(new wxStaticLine(panel), 0, wxEXPAND | wxTOP | wxBOTTOM, 8); + sp->Add(new wxStaticLine(panel), 0, wxEXPAND | wxTOP | wxBOTTOM, 16); wxSizer* s3 = new wxBoxSizer(wxVERTICAL); - s3->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("reminder")+_(":")), 0); - s3->Add(reminder, 1, wxEXPAND | wxTOP, 2); - s3->Add(ref_param, 0, wxALIGN_LEFT | wxTOP, 2); - s3->Add(errors, 0, wxEXPAND | wxTOP, 4); + s3->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("reminder")+_(":")), 0, wxTOP | wxLEFT, 4); + s3->Add(reminder, 1, wxEXPAND | wxTOP | wxLEFT, 4); + s3->Add(ref_param, 0, wxALIGN_LEFT | wxTOP | wxLEFT, 4); + s3->Add(errors, 0, wxEXPAND | wxTOP | wxLEFT, 4); //s3->Add(new wxStaticText(panel, wxID_ANY, _("Example:")), 0, wxTOP, 6); sp->Add(s3, 1, wxEXPAND | wxRIGHT, 4); - sp->Add(new wxStaticLine(panel), 0, wxEXPAND | wxTOP | wxBOTTOM, 8); + sp->Add(new wxStaticLine(panel), 0, wxEXPAND | wxTOP | wxBOTTOM, 16); wxSizer* s4 = new wxBoxSizer(wxVERTICAL); - s4->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("rules")+_(":")), 0); - s4->Add(rules, 1, wxEXPAND | wxTOP, 2); + s4->Add(new wxStaticText(panel, wxID_ANY, _LABEL_("rules")+_(":")), 0, wxTOP | wxLEFT, 4); + s4->Add(rules, 1, wxEXPAND | wxTOP | wxLEFT, 4); sp->Add(s4, 1, wxEXPAND | wxRIGHT, 4); panel->SetSizer(sp); // init splitter diff --git a/src/util/rotation.cpp b/src/util/rotation.cpp index 46f4a66c..94674c62 100644 --- a/src/util/rotation.cpp +++ b/src/util/rotation.cpp @@ -280,7 +280,7 @@ void RotatedDC::DrawRoundedRectangle(const RealRect& r, double radius) { void RotatedDC::DrawInvertRectangle(const RealRect& r) { wxRect r_ext = trRectToBB(r); - wxBitmap bmp(r_ext.width, r_ext.height, 24); + wxBitmap bmp(r_ext.width, r_ext.height, 24); wxMemoryDC memDC(bmp); memDC.Blit(0, 0, r_ext.width, r_ext.height, &dc, r_ext.x, r_ext.y); memDC.SelectObject(wxNullBitmap);