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

Added Statistics dimension/categories

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@84 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-11-20 22:13:52 +00:00
parent 23abbedcbd
commit b6f1a9aac7
18 changed files with 315 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/gallery_list.cpp
+52 -43
View File
@@ -8,6 +8,7 @@
#include <gui/control/gallery_list.hpp>
#include <gfx/gfx.hpp>
#include <wx/dcbuffer.h>
// ----------------------------------------------------------------------------- : Events
@@ -16,66 +17,62 @@ DEFINE_EVENT_TYPE(EVENT_GALLERY_ACTIVATE);
// ----------------------------------------------------------------------------- : GalleryList
const int MARGIN = 2; // margin around items
const int MARGIN = 1; // margin between items
const int BORDER = 1; // margin between items
GalleryList::GalleryList(Window* parent, int id, int direction)
: wxScrolledWindow(parent, id, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER)
: wxScrolledWindow(parent, id, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER | (direction == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL) )
, direction(direction)
{}
void GalleryList::update() {
const int w = item_size.GetWidth() + 2 * MARGIN;
const int h = item_size.GetHeight() + 2 * MARGIN;
const int w = item_size.width + MARGIN + 2*BORDER;
const int h = item_size.height + MARGIN + 2*BORDER;
// resize and scroll
if (direction == wxHORIZONTAL) {
// resize window
SetVirtualSize(w, h * (int)itemCount());
SetVirtualSize(w * (int)itemCount() + MARGIN, h + MARGIN);
SetScrollRate(w, 0);
// ensure selected item is visible
if (selection < itemCount()) {
int x, cw;
GetViewStart (&x, 0);
GetClientSize(&cw, 0);
cw /= w;
if ((int)selection < x) {
Scroll((int)selection, -1); // scroll up
} else if ((int)selection >= x + cw) {
Scroll((int)selection - cw - 1, -1); // scroll up
}
}
} else { // wxVERTICAL
// resize window
SetVirtualSize(w * (int)itemCount(), h);
SetVirtualSize(w, h * (int)itemCount() + MARGIN + MARGIN);
SetScrollRate(0, h);
// ensure selected item is visible
if (selection < itemCount()) {
int y, ch;
GetViewStart (0, &y);
GetClientSize(0, &ch);
ch /= w;
if ((int)selection < y) {
Scroll((int)selection, -1); // scroll up
} else if ((int)selection >= y + ch) {
Scroll((int)selection - ch - 1, -1); // scroll down
}
}
}
// ensure selected item + its margin is visible
if (selection < itemCount()) {
int x, y, cw, ch;
GetViewStart (&x, &y);
GetClientSize(&cw, &ch);
cw = (cw - w + 1) / w; ch = (ch - h + 1) / h;
RealPoint pos = itemPos(selection);
x = min(x, (int)selection);
y = min(y, (int)selection);
x = max(x + cw, (int)selection) - cw;
y = max(y + ch, (int)selection) - ch;
Scroll(x,y);
}
// redraw
Refresh(false);
}
size_t GalleryList::findItem(const wxMouseEvent& ev) {
size_t GalleryList::findItem(const wxMouseEvent& ev) const {
if (direction == wxHORIZONTAL) {
int x, w = item_size.GetWidth() + 2 * MARGIN;
int x, w = item_size.width + MARGIN + 2*BORDER;
GetViewStart (&x, 0);
return static_cast<size_t>( x + ev.GetX() / w );
} else { // wxVERTICAL
int y, h = item_size.GetHeight() + 2 * MARGIN;
int y, h = item_size.height + MARGIN + 2*BORDER;
GetViewStart (0, &y);
return static_cast<size_t>( y + ev.GetY() / h );
}
}
RealPoint GalleryList::itemPos(size_t item) const {
if (direction == wxHORIZONTAL) {
return RealPoint(item * (item_size.width + MARGIN + 2*BORDER) + MARGIN + BORDER, MARGIN + BORDER);
} else {
return RealPoint(MARGIN + BORDER, item * (item_size.height + MARGIN + 2*BORDER) + MARGIN + BORDER);
}
}
// ----------------------------------------------------------------------------- : Events
void GalleryList::onLeftDown(wxMouseEvent& ev) {
@@ -85,40 +82,50 @@ void GalleryList::onLeftDown(wxMouseEvent& ev) {
update();
sendEvent(EVENT_GALLERY_SELECT);
}
ev.Skip(); // focus
}
void GalleryList::onLeftDClick(wxMouseEvent& ev) {
sendEvent(EVENT_GALLERY_ACTIVATE);
}
void GalleryList::onKeyDown(wxKeyEvent& ev) {
void GalleryList::onChar(wxKeyEvent& ev) {
switch (ev.GetKeyCode()) {
case WXK_LEFT: if (direction == wxHORIZONTAL && selection > 0) {
selection -= 1;
update();
sendEvent(EVENT_GALLERY_SELECT);
} break;
case WXK_RIGHT: if (direction == wxHORIZONTAL && selection + 1 < itemCount()) {
selection += 1;
update();
sendEvent(EVENT_GALLERY_SELECT);
} break;
case WXK_UP: if (direction == wxVERTICAL && selection > 0) {
selection -= 1;
update();
sendEvent(EVENT_GALLERY_SELECT);
} break;
case WXK_DOWN: if (direction == wxVERTICAL && selection + 1 < itemCount()) {
selection += 1;
update();
sendEvent(EVENT_GALLERY_SELECT);
} break;
}
}
wxSize GalleryList::DoGetBestSize() const {
wxSize ws = GetSize(), cs = GetClientSize();
const int w = item_size.GetWidth() + 2 * MARGIN;
const int h = item_size.GetHeight() + 2 * MARGIN;
const int w = item_size.width + 2*MARGIN + 2*BORDER;
const int h = item_size.height + 2*MARGIN + 2*BORDER;
return wxSize(w, h) + ws - cs;
}
void GalleryList::onPaint(wxPaintEvent&) {
wxBufferedPaintDC dc(this);
DoPrepareDC(dc);
OnDraw(dc);
}
void GalleryList::OnDraw(DC& dc) {
int x, y;
int cw, ch;
@@ -128,13 +135,13 @@ void GalleryList::OnDraw(DC& dc) {
GetViewStart(&x, &y);
GetClientSize(&cw, &ch);
if (direction == wxHORIZONTAL) {
dx = item_size.GetWidth() + 2 * MARGIN;
dx = item_size.width + MARGIN + 2*BORDER;
dy = 0;
start = (size_t) x;
end = (size_t) (start + cw / dx + 1);
} else {
dx = 0;
dy = item_size.GetHeight() + 2 * MARGIN;
dy = item_size.height + MARGIN + 2*BORDER;
start = (size_t) y;
end = (size_t) (start + ch / dy + 1);
}
@@ -153,9 +160,10 @@ void GalleryList::OnDraw(DC& dc) {
Color c = selected ? wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) : unselected;
dc.SetPen(c);
dc.SetBrush(lerp(background, c, 0.3));
dc.DrawRectangle((int)i * dx + 1, (int)i * dy + 1, item_size.GetWidth() + 2, item_size.GetHeight() + 2);
RealPoint pos = itemPos(i);
dc.DrawRectangle(pos.x - BORDER, pos.y - BORDER, item_size.width + 2*BORDER, item_size.height + 2*BORDER);
// draw item
drawItem(dc, (int)i * dx + MARGIN, (int)i * dy + MARGIN, i, selected);
drawItem(dc, pos.x, pos.y, i, selected);
}
}
@@ -169,5 +177,6 @@ void GalleryList::sendEvent(WXTYPE type) {
BEGIN_EVENT_TABLE(GalleryList, wxScrolledWindow)
EVT_LEFT_DOWN (GalleryList::onLeftDown)
EVT_LEFT_DCLICK (GalleryList::onLeftDClick)
EVT_KEY_DOWN (GalleryList::onKeyDown)
EVT_CHAR (GalleryList::onChar)
EVT_PAINT (GalleryList::onPaint)
END_EVENT_TABLE ()
src/gui/control/gallery_list.hpp
+7 -3
View File
@@ -10,6 +10,7 @@
// ----------------------------------------------------------------------------- : Includes
#include <util/prec.hpp>
#include <util/real_point.hpp>
// ----------------------------------------------------------------------------- : Events
@@ -36,7 +37,7 @@ class GalleryList : public wxScrolledWindow {
protected:
static const size_t NO_SELECTION = (size_t)-1;
size_t selection; ///< The selected item, or NO_SELECTION if there is no selection
wxSize item_size; ///< The size of a single item
RealSize item_size; ///< The size of a single item
int direction; ///< Direction of the list, can be wxHORIZONTAL or wxVERTICAL
/// Redraw the list after changing the selection or the number of items
@@ -55,11 +56,14 @@ class GalleryList : public wxScrolledWindow {
void onLeftDown (wxMouseEvent& ev);
void onLeftDClick(wxMouseEvent& ev);
void onKeyDown(wxKeyEvent& ev);
void onChar(wxKeyEvent& ev);
void onPaint(wxPaintEvent&);
void OnDraw(DC& dc);
/// Find the item corresponding to the given location
size_t findItem(const wxMouseEvent&);
size_t findItem(const wxMouseEvent&) const;
/// Find the coordinates of an item
RealPoint itemPos(size_t item) const;
/// Send an event
void sendEvent(WXTYPE type);
};
src/gui/control/package_list.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ void PackageList::drawItem(DC& dc, int x, int y, size_t item, bool selected) {
int w, h;
// draw image
if (d.image.Ok()) {
dc.DrawBitmap(d.image, x + align_delta_x(ALIGN_CENTER, item_size.GetWidth(), d.image.GetWidth()), y + 3);
dc.DrawBitmap(d.image, x + align_delta_x(ALIGN_CENTER, item_size.width, d.image.GetWidth()), y + 3);
}
// draw short name
dc.SetFont(wxFont(12,wxSWISS,wxNORMAL,wxBOLD,false,_("Arial")));