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:
twanvl
2006-12-22 15:08:49 +00:00
parent 5a8febd82a
commit 274cb1117f
14 changed files with 82 additions and 52 deletions
+1 -4
View File
@@ -20,10 +20,7 @@ CardViewer::CardViewer(Window* parent, int id, long style)
wxSize CardViewer::DoGetBestSize() const {
wxSize ws = GetSize(), cs = GetClientSize();
if (set) {
StyleSheetP stylesheet = set->stylesheetFor(card);
if (stylesheet) {
return wxSize(stylesheet->card_width, stylesheet->card_height) + ws - cs;
}
return (wxSize)getRotation().getExternalSize() + ws - cs;
}
return cs;
}
+2 -2
View File
@@ -91,7 +91,7 @@ SetInfoEditor::SetInfoEditor(Window* parent, int id, long style)
{}
void SetInfoEditor::onChangeSet() {
setStyles(set->stylesheet->set_info_style);
setStyles(set->stylesheet, set->stylesheet->set_info_style);
setData(set->data);
}
@@ -103,7 +103,7 @@ StylingEditor::StylingEditor(Window* parent, int id, long style)
void StylingEditor::showStylesheet(const StyleSheetP& stylesheet) {
this->stylesheet = stylesheet;
setStyles(stylesheet->styling_style);
setStyles(set->stylesheet, stylesheet->styling_style);
setData(set->stylingDataFor(*stylesheet));
}
+1 -1
View File
@@ -56,7 +56,7 @@ void TextCtrl::setValue(String* value) {
// assign to this control
IndexMap<FieldP,StyleP> styles; styles.add(field, style);
IndexMap<FieldP,ValueP> values; values.add(field, value);
setStyles(styles);
setStyles(set->stylesheet, styles);
setData(values);
// determine required height
viewers.front()->getEditor()->determineSize();