Commit a006a82a authored by twanvl's avatar twanvl

tweaks to splitter; filtered cardlist always initialized

parent e5abf752
...@@ -97,8 +97,8 @@ StatsPanel::StatsPanel(Window* parent, int id) ...@@ -97,8 +97,8 @@ StatsPanel::StatsPanel(Window* parent, int id)
card_list = new FilteredCardList(splitter, wxID_ANY); card_list = new FilteredCardList(splitter, wxID_ANY);
// init splitter // init splitter
splitter->SetMinimumPaneSize(100); splitter->SetMinimumPaneSize(100);
splitter->SetSashGravity(1.0); splitter->SetSashGravity(0.6);
splitter->SplitHorizontally(graph, card_list, -100); splitter->SplitHorizontally(graph, card_list, -170);
// init sizer // init sizer
wxSizer* s = new wxBoxSizer(wxHORIZONTAL); wxSizer* s = new wxBoxSizer(wxHORIZONTAL);
s->Add(categories, 0, wxEXPAND | wxRIGHT, 2); s->Add(categories, 0, wxEXPAND | wxRIGHT, 2);
...@@ -110,6 +110,7 @@ StatsPanel::StatsPanel(Window* parent, int id) ...@@ -110,6 +110,7 @@ StatsPanel::StatsPanel(Window* parent, int id)
void StatsPanel::onChangeSet() { void StatsPanel::onChangeSet() {
card_list->setSet(set); card_list->setSet(set);
categories->show(set->game); categories->show(set->game);
filterCards();
} }
void StatsPanel::onCommand(int id) { void StatsPanel::onCommand(int id) {
...@@ -131,6 +132,7 @@ void StatsPanel::onCommand(int id) { ...@@ -131,6 +132,7 @@ void StatsPanel::onCommand(int id) {
d.elements.push_back(e); d.elements.push_back(e);
} }
graph->setData(d); graph->setData(d);
filterCards();
} }
break; break;
} }
...@@ -157,6 +159,10 @@ class StatsFilter : public CardListFilter { ...@@ -157,6 +159,10 @@ class StatsFilter : public CardListFilter {
}; };
void StatsPanel::onGraphSelect(wxCommandEvent&) { void StatsPanel::onGraphSelect(wxCommandEvent&) {
filterCards();
}
void StatsPanel::filterCards() {
if (!categories->hasSelection()) return; if (!categories->hasSelection()) return;
shared_ptr<StatsFilter> filter(new StatsFilter(*set)); shared_ptr<StatsFilter> filter(new StatsFilter(*set));
StatsCategory& cat = categories->getSelection(); StatsCategory& cat = categories->getSelection();
......
...@@ -41,6 +41,7 @@ class StatsPanel : public SetWindowPanel { ...@@ -41,6 +41,7 @@ class StatsPanel : public SetWindowPanel {
FilteredCardList* card_list; FilteredCardList* card_list;
void onGraphSelect(wxCommandEvent&); void onGraphSelect(wxCommandEvent&);
void filterCards();
}; };
// ----------------------------------------------------------------------------- : EOF // ----------------------------------------------------------------------------- : EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment