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

tweaks to dimension list control

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1048 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-04 14:15:07 +00:00
parent 48f1315cda
commit dd80a51e96
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/gallery_list.cpp
+6 -3
View File
@@ -44,11 +44,14 @@ void GalleryList::selectColumn(size_t column) {
void GalleryList::select(size_t item, size_t column, bool event) {
if (item >= itemCount()) return;
// select
bool changes = false;
// select column
size_t old_active_column = active_column;
selectColumn(column);
onSelect(item, active_column, changes);
Column& col = columns[active_column];
// filter?
bool changes = col.selection != item;
onSelect(item, old_active_column, changes);
// select
size_t old_sel = col.selection;
col.selection = item;
changes |= col.selection != old_sel;
src/gui/set/stats_panel.cpp
+25 -7
View File
@@ -144,6 +144,12 @@ class StatDimensionList : public GalleryList {
const int dimension_count;
size_t prefered_dimension_count;
void restrictDimensions(size_t dims) {
prefered_dimension_count = dims;
active_column = min(active_column, dims);
RefreshSelection();
}
protected:
virtual size_t itemCount() const;
virtual void drawItem(DC& dc, int x, int y, size_t item);
@@ -152,19 +158,32 @@ class StatDimensionList : public GalleryList {
return col-1 >= prefered_dimension_count ? 0.2 : 0.7;
}
virtual void onSelect(size_t item, size_t col, bool& changes) {
virtual void onSelect(size_t item, size_t old_col, bool& changes) {
// swap selection with another column?
for (size_t j = 1 ; j < columns.size() ; ++j) {
if (j != col && columns[j].selection == item) {
columns[j].selection = columns[col].selection;
if (j != active_column && columns[j].selection == item && columns[active_column].selection != item) {
columns[j].selection = columns[active_column].selection;
changes = true;
break;
}
}
// update prefered dimension count?
if (col > prefered_dimension_count) {
prefered_dimension_count = col;
if (active_column > prefered_dimension_count) {
prefered_dimension_count = active_column;
changes = true;
RefreshSelection();
}
// decrease dimension count? (toggle last dimension)
if (!changes && old_col == active_column) {
if (active_column == prefered_dimension_count && prefered_dimension_count > 1) {
prefered_dimension_count -= 1;
selectColumn(prefered_dimension_count);
changes = true;
} else if (active_column != prefered_dimension_count) {
active_column = prefered_dimension_count = active_column;
RefreshSelection();
changes = true;
}
}
}
@@ -490,9 +509,8 @@ void StatsPanel::showLayout(GraphType layout) {
#if USE_DIMENSION_LISTS && !USE_SEPARATE_DIMENSION_LISTS
// make sure we have the right number of data dimensions
if (dimensions->prefered_dimension_count != dimensionality(layout)) {
dimensions->prefered_dimension_count = dimensionality(layout);
dimensions->restrictDimensions(dimensionality(layout));
showCategory(&layout); // full update
dimensions->RefreshSelection();
return;
}
#endif