1 files changed, 23 insertions, 23 deletions

@@ -1,9 +1,9 @@
 #include "tile_widget.h"
 #include "map.h"
 
-IMPLEMENT_DYNAMIC_CLASS(TileWidget,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(TileWidget,wxScrolledWindow)
 
-BEGIN_EVENT_TABLE(TileWidget, wxControl)
+BEGIN_EVENT_TABLE(TileWidget, wxScrolledWindow)
         EVT_PAINT(TileWidget::OnPaint)
   EVT_LEFT_DOWN(TileWidget::OnClick)
 END_EVENT_TABLE()
@@ -13,8 +13,8 @@ TileWidget::TileWidget()
   Init();
 }
 
-TileWidget::TileWidget(wxWindow* parent, wxWindowID winid, int numTilesWidth, const wxPoint& pos, const wxSize& size)
-  : wxControl(parent, winid, pos, size), numTilesWidth(numTilesWidth)
+TileWidget::TileWidget(wxWindow* parent, wxWindowID winid, int width, int scale, const wxPoint& pos, const wxSize& size)
+  : wxScrolledWindow(parent, winid, pos, size), numTilesWidth(width), scale(scale)
 {
   Init();
 }
@@ -27,7 +27,11 @@ int TileWidget::getSelected()
 void TileWidget::Init()
 {
   tiles = wxBitmap(wxImage("../../../res/tiles.png"));
-  numTiles = 50;
+  
+  this->FitInside();
+  this->SetScrollRate(5, 5);
+  
+  SetVirtualSize(numTilesWidth*TILE_WIDTH*scale, (numTiles / numTilesWidth + 1) * TILE_HEIGHT*scale);
 }
 
 void TileWidget::OnPaint(wxPaintEvent& event)
@@ -35,39 +39,35 @@ void TileWidget::OnPaint(wxPaintEvent& event)
   wxPaintDC dc(this);
   wxMemoryDC tiles_dc;
   tiles_dc.SelectObject(tiles);
-  wxRegionIterator upd(GetUpdateRegion());
-  int vW = upd.GetW();
-  int vH = upd.GetH();
   
-  wxPen pen(*wxGREEN, 2);
-  dc.SetPen(pen);
-  dc.SetBrush(*wxTRANSPARENT_BRUSH);
+  int vX, vY, vW, vH, aW, aH;
+  GetViewStart(&vX, &vY);
+  GetVirtualSize(&vW, &vH);
+  GetSize(&aW, &aH);
 
-  double endWidth = (double) vW / (double) numTilesWidth;
-  double endHeight = TILE_HEIGHT * (endWidth / (double) TILE_WIDTH);
-  
   for (int i=0; i<numTiles; i++)
   {
-    dc.StretchBlit(i%numTilesWidth*endWidth, i/numTilesWidth*endHeight, endWidth, endHeight, &tiles_dc, i%8*TILE_WIDTH, i/8*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT);
+    dc.StretchBlit(i%numTilesWidth*TILE_WIDTH*scale-vX, i/numTilesWidth*TILE_HEIGHT*scale-vY, TILE_WIDTH*scale, TILE_HEIGHT*scale, &tiles_dc, i%8*TILE_WIDTH, i/8*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT);
     
     if (i == selected)
     {
-      dc.DrawRectangle(i%numTilesWidth*endWidth, i/numTilesWidth*endHeight, endWidth, endHeight);
+      wxPen pen(*wxGREEN, 2);
+      dc.SetPen(pen);
+      dc.SetBrush(*wxTRANSPARENT_BRUSH);
+      dc.DrawRectangle(i%numTilesWidth*TILE_WIDTH*scale - vX, i/numTilesWidth*TILE_HEIGHT*scale - vY, TILE_WIDTH*scale, TILE_HEIGHT*scale);
     }
   }
 }
 
 void TileWidget::OnClick(wxMouseEvent& event)
 {
-  wxRegionIterator upd(GetUpdateRegion());
-  int vW = upd.GetW();
-  int vH = upd.GetH();
-  double endWidth = (double) vW / (double) numTilesWidth;
-  double endHeight = TILE_HEIGHT * (endWidth / (double) TILE_WIDTH);
+  int vX, vY, vW, vH;
+  GetViewStart(&vX, &vY);
+  GetVirtualSize(&vW, &vH);
   
   wxPoint pos = event.GetPosition();
-  int x = pos.x / endWidth;
-  int y = pos.y / endHeight;
+  int x = (pos.x + vX) / (TILE_WIDTH * scale);
+  int y = (pos.y + vY) / (TILE_HEIGHT * scale);
   
   selected = x+y*numTilesWidth;