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

rebase (#1)

Browse Source 
* Include unordered_map (fixes #104)

* Make templates localizable (Closes #100)

* Check/uncheck all selected cards in export window (Closes #93)

Co-authored-by: Twan van Laarhoven <twanvl@gmail.com>
This commit is contained in:
Carl Miller, Jr
2021-02-15 02:18:50 -05:00
committed by GitHub
parent cb3766ea82
commit 3a243f23e6
26 changed files with 183 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/native_look_editor.cpp
+2 -5
View File
@@ -39,9 +39,7 @@ void NativeLookEditor::drawViewer(RotatedDC& dc, ValueViewer& v) {
// draw label
dc.SetFont(*wxNORMAL_FONT);
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT));
// TODO : tr using stylesheet or using game?
dc.DrawText(tr(getStylePackage(), v.getField()->caption, identity),
RealPoint(margin_left - v.bounding_box.x, 1));
dc.DrawText(v.getField()->caption.get(), RealPoint(margin_left - v.bounding_box.x, 1));
}
// draw viewer
v.draw(dc);
@@ -64,8 +62,7 @@ void NativeLookEditor::resizeViewers() {
// width of the label string
int w;
Style& s = *v->getStyle();
String text = tr(getStylePackage(), s.fieldP->caption, identity);
dc.GetTextExtent(text,&w,nullptr);
dc.GetTextExtent(s.fieldP->caption.get(), &w, nullptr);
label_width = max(label_width, w + label_margin);
}
}