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

Removed last of the BeginDrawing/EndDrawing calls;

Browse Source 
Added english_number_ordinal script function;
Working on symbols with a different aspect ratio (i.e. wider/smaller symbols)

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@558 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-07-12 17:01:07 +00:00
parent b21192646b
commit d590819762
22 changed files with 137 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/symbol/control.cpp
+17 -15
View File
@@ -177,20 +177,18 @@ void SymbolControl::draw(DC& dc) {
SymbolViewer::draw(dc);
// draw grid
if (settings.symbol_grid) {
RotatedDC rdc(dc, rotation, QUALITY_LOW);
double lines = settings.symbol_grid_size;
double end = rotation.trS(1);
for (int i = 0 ; i <= lines ; ++i) {
int x = (int) floor(rotation.trS(i/lines-0.0001));
//dc.SetPen(Color(0, i%5 == 0 ? 64 : 31, 0));
//dc.SetPen(Color(i%5 == 0 ? 64 : 31, 0, 0));
dc.SetLogicalFunction(wxAND);
dc.SetPen(i%5 == 0 ? Color(191,255,191) : Color(191, 255, 191));
dc.DrawLine(x, 0, x, end);
dc.DrawLine(0, x, end, x);
dc.SetLogicalFunction(wxOR);
dc.SetPen(i%5 == 0 ? Color(0,63,0) : Color(0, 31, 0));
dc.DrawLine(x, 0, x, end);
dc.DrawLine(0, x, end, x);
double x = (double)i/lines;
rdc.SetLogicalFunction(wxAND);
rdc.SetPen(i%5 == 0 ? Color(191,255,191) : Color(191, 255, 191));
rdc.DrawLine(RealPoint(0,x), RealPoint(1,x));
rdc.DrawLine(RealPoint(x,0), RealPoint(x,1));
rdc.SetLogicalFunction(wxOR);
rdc.SetPen(i%5 == 0 ? Color(0,63,0) : Color(0, 31, 0));
rdc.DrawLine(RealPoint(0,x), RealPoint(1,x));
rdc.DrawLine(RealPoint(x,0), RealPoint(x,1));
}
dc.SetLogicalFunction(wxCOPY);
}
@@ -201,9 +199,7 @@ void SymbolControl::draw(DC& dc) {
}
void SymbolControl::onPaint(wxPaintEvent&) {
wxBufferedPaintDC dc(this);
dc.BeginDrawing();
draw(dc);
dc.EndDrawing();
}
// ----------------------------------------------------------------------------- : Events
@@ -256,7 +252,13 @@ void SymbolControl::onChar(wxKeyEvent& ev) {
void SymbolControl::onSize(wxSizeEvent& ev) {
wxSize s = GetClientSize();
setZoom(min(s.GetWidth(), s.GetHeight()));
int zoom = min(s.x, s.y);
setZoom(zoom);
if (s.x > zoom) {
setOrigin(Vector2D((s.x - zoom) * 0.5, 0));
} else {
setOrigin(Vector2D(0, (s.y - zoom) * 0.5));
}
Refresh(false);
}
void SymbolControl::onUpdateUI(wxUpdateUIEvent& ev) {