amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed redraw issue of text behind word list drop down arrows

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@636 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-08-28 18:46:54 +00:00
parent fcc89b64d6
commit a360b334c5
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/value/text.cpp
+27 -9
View File
@@ -301,7 +301,7 @@ void DropDownWordList::select(size_t item) {
}
void DropDownWordList::redrawArrowOnParent() {
tve.redrawWordListIndicators();
tve.redrawWordListIndicators(true);
}
// ----------------------------------------------------------------------------- : TextValueEditor
@@ -591,8 +591,8 @@ 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) {
if (!isCurrent()) return;
if (old_drop_down_shown && dropDownShown()) return;
//% if (!isCurrent()) return;
//% if (old_drop_down_shown && dropDownShown()) return;
// Hide caret
wxCaret* caret = editor().GetCaret();
if (caret->IsVisible()) caret->Hide();
@@ -616,6 +616,8 @@ void TextValueEditor::redrawSelection(size_t old_selection_start_i, size_t old_s
updateScrollbar();
redraw();
} else {
// remove indicators
clearWordListIndicators(dc);
// draw new selection
if (!dropDownShown()) {
v.drawSelection(dc, style(), selection_start_i, selection_end_i);
@@ -1282,8 +1284,27 @@ void TextValueEditor::findWordLists() {
}
}
void TextValueEditor::redrawWordListIndicators() {
if (isCurrent()) {
void TextValueEditor::clearWordListIndicators(RotatedDC& dc) {
Rotater rot(dc, style().getRotation());
bool current = isCurrent();
FOR_EACH(wl, word_lists) {
if (current && drop_down && drop_down->IsShown() && drop_down->getPos() == wl) {
continue;
} else if (current && selection_end_i >= wl->start && selection_end_i <= wl->end && !dropDownShown()) {
continue;
} else if (wl.get() == hovered_words) {
continue;
}
// restore background
if (wl->behind.Ok()) {
dc.DrawBitmap(wl->behind, wl->rect.topRight() + RealSize(0,-1));
}
}
}
void TextValueEditor::redrawWordListIndicators(bool toggling_dropdown) {
redrawSelection(selection_start_i, selection_end_i, dropDownShown() != toggling_dropdown);
/*//%%if (isCurrent()) {
// Hide caret
wxCaret* caret = editor().GetCaret();
if (caret->IsVisible()) caret->Hide();
@@ -1291,7 +1312,7 @@ void TextValueEditor::redrawWordListIndicators() {
drawWordListIndicators(*editor().overdrawDC(), true);
if (isCurrent()) {
showCaret();
}
}*/
}
void TextValueEditor::drawWordListIndicators(RotatedDC& dc, bool redrawing) {
@@ -1322,9 +1343,6 @@ void TextValueEditor::drawWordListIndicators(RotatedDC& dc, bool redrawing) {
// capture background?
if (!redrawing) {
wl->behind = dc.GetBackground(RealRect(r.right(), r.top() - 1, 10, r.height + 3));
} else if (small && wl->behind.Ok()) {
// restore background
dc.DrawBitmap(wl->behind, r.topRight() + RealSize(0,-1));
}
// draw rectangle around value
dc.SetBrush(*wxTRANSPARENT_BRUSH);
src/gui/value/text.hpp
+3 -1
View File
@@ -172,8 +172,10 @@ class TextValueEditor : public TextValueViewer, public ValueEditor {
void findWordLists();
/// Draw word list indicators
void drawWordListIndicators(RotatedDC& dc, bool redrawing = false);
/// Remove word list indicators
void clearWordListIndicators(RotatedDC& dc);
/// Re-draw word list indicators
void redrawWordListIndicators();
void redrawWordListIndicators(bool toggling_dropdown = false);
/// Find a WordListPos under the mouse cursor (if any), pos is in internal coordinates
WordListPosP findWordList(const RealPoint& pos) const;
/// Find a WordListPos rectangle under the mouse cursor (if any), pos is in internal coordinates