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

fixed: "Double click to select image" text now always shown when editing;

Browse Source 
Correct control used for clipboard actions in CardsPanel

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@253 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-04-12 19:39:08 +00:00
parent 3dd0521c40
commit f915a491a8
6 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/card_editor.cpp
+3
View File
@@ -39,6 +39,9 @@ bool DataEditor::drawBorders() const {
settings.stylesheetSettingsFor(*set->stylesheetFor(card)).card_borders();
}
bool DataEditor::drawEditing() const {
return true;
}
bool DataEditor::drawFocus() const {
return FindFocus() == this;
}
src/gui/control/card_editor.hpp
+1
View File
@@ -26,6 +26,7 @@ class DataEditor : public CardViewer {
virtual bool drawBorders() const;
virtual bool drawEditing() const;
virtual bool drawFocus() const;
virtual wxPen borderPen(bool active) const;
virtual ValueViewer* focusedViewer() const;
src/gui/set/cards_panel.cpp
+14 -6
View File
@@ -249,12 +249,20 @@ bool CardsPanel::wantsToHandle(const Action&, bool undone) const {
// ----------------------------------------------------------------------------- : Clipboard
bool CardsPanel::canCut() const { return focused_control(this) == ID_EDITOR ? editor->canCut() : card_list->canCut(); }
bool CardsPanel::canCopy() const { return focused_control(this) == ID_EDITOR ? editor->canCopy() : card_list->canCopy(); }
bool CardsPanel::canPaste() const { return focused_control(this) == ID_EDITOR ? editor->canPaste() : card_list->canPaste(); }
void CardsPanel::doCut() { if (focused_control(this) == ID_EDITOR) editor->doCut(); else card_list->doCut(); }
void CardsPanel::doCopy() { if (focused_control(this) == ID_EDITOR) editor->doCopy(); else card_list->doCopy(); }
void CardsPanel::doPaste() { if (focused_control(this) == ID_EDITOR) editor->doPaste(); else card_list->doPaste(); }
// determine what control to use for clipboard actions
#define CUT_COPY_PASTE(op,return) \
int id = focused_control(this); \
if (id == ID_EDITOR) { return editor->op(); } \
else if (id == ID_CARD_LIST) { return card_list->op(); } \
else if (id == ID_NOTES) { return notes->op(); } \
else { return false; }
bool CardsPanel::canCut() const { CUT_COPY_PASTE(canCut, return) }
bool CardsPanel::canCopy() const { CUT_COPY_PASTE(canCopy, return) }
bool CardsPanel::canPaste() const { CUT_COPY_PASTE(canPaste, return) }
void CardsPanel::doCut() { CUT_COPY_PASTE(doCut, ;) }
void CardsPanel::doCopy() { CUT_COPY_PASTE(doCopy, ;) }
void CardsPanel::doPaste() { CUT_COPY_PASTE(doPaste, ;) }
// ----------------------------------------------------------------------------- : Searching