summary refs log tree commit diff stats
path: root/tools/mapedit/src/tile_widget.cpp
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2015-03-15 23:24:22 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2015-03-15 23:24:22 -0400
commit213cab3c04b81428ab715f340bd7c12438fdb980 (patch)
tree295d25eac4b94357ac5b9bb4b3fd03130181b956 /tools/mapedit/src/tile_widget.cpp
parent25240241e91dc913d20fbb93aa4acc9433dda6a0 (diff)
downloadtherapy-213cab3c04b81428ab715f340bd7c12438fdb980.tar.gz
therapy-213cab3c04b81428ab715f340bd7c12438fdb980.tar.bz2
therapy-213cab3c04b81428ab715f340bd7c12438fdb980.zip
Map editor can now add entities to maps
Also fixed a big bug regarding scrolling
Diffstat (limited to 'tools/mapedit/src/tile_widget.cpp')
-rw-r--r--tools/mapedit/src/tile_widget.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/mapedit/src/tile_widget.cpp b/tools/mapedit/src/tile_widget.cpp index 3b00e59..dc39fdd 100644 --- a/tools/mapedit/src/tile_widget.cpp +++ b/tools/mapedit/src/tile_widget.cpp
@@ -34,7 +34,7 @@ void TileWidget::Init()
34 SetVirtualSize(numTilesWidth*TILE_WIDTH*scale, (numTiles / numTilesWidth + 1) * TILE_HEIGHT*scale); 34 SetVirtualSize(numTilesWidth*TILE_WIDTH*scale, (numTiles / numTilesWidth + 1) * TILE_HEIGHT*scale);
35} 35}
36 36
37void TileWidget::OnPaint(wxPaintEvent& event) 37void TileWidget::OnPaint(wxPaintEvent&)
38{ 38{
39 wxPaintDC dc(this); 39 wxPaintDC dc(this);
40 wxMemoryDC tiles_dc; 40 wxMemoryDC tiles_dc;
@@ -42,6 +42,10 @@ void TileWidget::OnPaint(wxPaintEvent& event)
42 42
43 int vX, vY, vW, vH, aW, aH; 43 int vX, vY, vW, vH, aW, aH;
44 GetViewStart(&vX, &vY); 44 GetViewStart(&vX, &vY);
45 int vXX, vYX;
46 GetScrollPixelsPerUnit(&vXX, &vYX);
47 vX *= vXX;
48 vY *= vYX;
45 GetVirtualSize(&vW, &vH); 49 GetVirtualSize(&vW, &vH);
46 GetSize(&aW, &aH); 50 GetSize(&aW, &aH);
47 51
@@ -63,6 +67,10 @@ void TileWidget::OnClick(wxMouseEvent& event)
63{ 67{
64 int vX, vY, vW, vH; 68 int vX, vY, vW, vH;
65 GetViewStart(&vX, &vY); 69 GetViewStart(&vX, &vY);
70 int vXX, vYX;
71 GetScrollPixelsPerUnit(&vXX, &vYX);
72 vX *= vXX;
73 vY *= vYX;
66 GetVirtualSize(&vW, &vH); 74 GetVirtualSize(&vW, &vH);
67 75
68 wxPoint pos = event.GetPosition(); 76 wxPoint pos = event.GetPosition();