mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 05:07:00 -04:00
rotation and style changing works
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@144 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -175,7 +175,7 @@ void CardsPanel::onCommand(int id) {
|
||||
: id == ID_CARD_ROTATE_180 ? 180
|
||||
: 270
|
||||
);
|
||||
//onRenderSettingsChange();
|
||||
set->actions.tellListeners(DisplayChangeAction(),true);
|
||||
break;
|
||||
}
|
||||
case ID_SELECT_COLUMNS: {
|
||||
@@ -196,8 +196,13 @@ bool CardsPanel::wantsToHandle(const Action&, bool undone) const {
|
||||
return false;
|
||||
}
|
||||
|
||||
void CardsPanel::onAction(const Action& action, bool undo) {
|
||||
// TODO
|
||||
void CardsPanel::onAction(const Action& action, bool undone) {
|
||||
TYPE_CASE_(action, DisplayChangeAction) {
|
||||
// The style changed, maybe also the size of editor
|
||||
Layout();
|
||||
//if (current_panel) current_panel->Layout();
|
||||
//fixMinWindowSize();
|
||||
}
|
||||
}
|
||||
|
||||
void CardsPanel::onRenderSettingsChange() {
|
||||
@@ -224,4 +229,5 @@ void CardsPanel::selectCard(const CardP& card) {
|
||||
card_list->setCard(card);
|
||||
editor->setCard(card);
|
||||
notes->setValue(card ? &card->notes : nullptr);
|
||||
Layout();
|
||||
}
|
||||
|
||||
@@ -83,11 +83,13 @@ void StylePanel::onStyleSelect(wxCommandEvent&) {
|
||||
stylesheet = StyleSheetP();
|
||||
}
|
||||
set->actions.add(new ChangeCardStyleAction(card, stylesheet));
|
||||
Layout();
|
||||
}
|
||||
}
|
||||
|
||||
void StylePanel::onUseForAll(wxCommandEvent&) {
|
||||
set->actions.add(new ChangeSetStyleAction(*set, card));
|
||||
Layout();
|
||||
}
|
||||
|
||||
BEGIN_EVENT_TABLE(StylePanel, wxPanel)
|
||||
|
||||
+10
-12
@@ -27,6 +27,7 @@
|
||||
#include <data/card.hpp>
|
||||
#include <data/settings.hpp>
|
||||
#include <data/format/formats.hpp>
|
||||
#include <data/action/set.hpp>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(SetWindowPanel*);
|
||||
DECLARE_TYPEOF_COLLECTION(SetWindow*);
|
||||
@@ -231,11 +232,11 @@ void SetWindow::onChangeSet() {
|
||||
}
|
||||
|
||||
void SetWindow::onAction(const Action& action, bool undone) {
|
||||
// TYPE_CASE_(action, SetStyleChange) {
|
||||
// // The style changed, maybe also the size of the viewer
|
||||
// Layout();
|
||||
// fixMinWindowSize();
|
||||
// }
|
||||
TYPE_CASE_(action, DisplayChangeAction) {
|
||||
// The style changed, maybe also the size of card viewers
|
||||
if (current_panel) current_panel->Layout();
|
||||
fixMinWindowSize();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -517,13 +518,10 @@ void SetWindow::onReplaceAll(wxFindDialogEvent&) {
|
||||
|
||||
void SetWindow::onEditPreferences(wxCommandEvent&) {
|
||||
PreferencesWindow wnd(this);
|
||||
wnd.ShowModal();
|
||||
// if (wnd.ShowModal() == wxID_OK) {
|
||||
// // render settings may have changed, notify all windows
|
||||
// FOR_EACH(m, setWindows) {
|
||||
// m->onRenderSettingsChange();
|
||||
// }
|
||||
// }
|
||||
if (wnd.ShowModal() == wxID_OK) {
|
||||
// render settings may have changed, notify all windows
|
||||
set->actions.tellListeners(DisplayChangeAction(),true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user