mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-09 20:47:00 -04:00
Compare commits
2 Commits
1a64496206
...
d9b58bb5eb
| Author | SHA1 | Date | |
|---|---|---|---|
| d9b58bb5eb | |||
| 512a237f39 |
+3
-4
@@ -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}")
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
+11
-3
@@ -665,12 +665,13 @@ void TextValueEditor::draw(RotatedDC& dc) {
|
||||
}
|
||||
}
|
||||
|
||||
void TextValueEditor::redrawSelection(size_t old_selection_start_i, size_t old_selection_end_i, bool old_drop_down_shown) {
|
||||
void TextValueEditor::redrawSelection(size_t old_selection_start_i, size_t old_selection_end_i, bool old_drop_down_shown) {
|
||||
// Hide caret
|
||||
if (isCurrent()) {
|
||||
wxCaret* caret = editor().GetCaret();
|
||||
if (caret->IsVisible()) caret->Hide();
|
||||
}
|
||||
}
|
||||
#ifdef __WXMSW__
|
||||
// Destroy the clientDC before reshowing the caret, prevent flicker on MSW
|
||||
{
|
||||
// Move selection
|
||||
@@ -701,7 +702,14 @@ void TextValueEditor::redrawSelection(size_t old_selection_start_i, size_t old_s
|
||||
// redraw drop down indicators
|
||||
drawWordListIndicators(dc, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
scroll_with_cursor = true;
|
||||
if (ensureCaretVisible()) {
|
||||
updateScrollbar();
|
||||
}
|
||||
redraw();
|
||||
#endif
|
||||
if (isCurrent()) {
|
||||
showCaret();
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user