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

Fixed caret size.

Browse Source 
Made delete card button greyed-out with only one card in set (oops)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@404 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2007-05-20 21:28:28 +00:00
parent bd891efc15
commit af89fe04d5
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/cards_panel.cpp
+1 -1
View File
@@ -158,7 +158,7 @@ void CardsPanel::onUpdateUI(wxUpdateUIEvent& ev) {
ev.Check(ss.card_angle() == a); ev.Check(ss.card_angle() == a);
break; break;
} }
case ID_CARD_REMOVE: ev.Enable(set->cards.size() > 0); break; case ID_CARD_REMOVE: ev.Enable(set->cards.size() > 1); break;
case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_SYMBOL: case ID_FORMAT_REMINDER: { case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_SYMBOL: case ID_FORMAT_REMINDER: {
if (focused_control(this) == ID_EDITOR) { if (focused_control(this) == ID_EDITOR) {
ev.Enable(editor->canFormat(ev.GetId())); ev.Enable(editor->canFormat(ev.GetId()));
src/util/rotation.cpp
+10 -2
View File
@@ -250,10 +250,18 @@ RealSize RotatedDC::GetTextExtent(const String& text) const {
} }
} }
double RotatedDC::GetCharHeight() const { double RotatedDC::GetCharHeight() const {
int h = dc.GetCharHeight();
#ifdef __WXGTK__
// See above HACK
int extent;
dc.GetTextExtent(_("H"), 0, &extent);
if (h != extent)
h = 2 * extent - h;
#endif
if (quality == QUALITY_LOW) { if (quality == QUALITY_LOW) {
return dc.GetCharHeight() / zoom; return h / zoom;
} else { } else {
return dc.GetCharHeight() / zoom / text_scaling; return h / zoom / text_scaling;
} }
} }