13
0

Lua Dialogs: only add a scroller if we have 16+ items in the dialog

This commit is contained in:
Ben Loftis 2022-05-23 09:51:51 -05:00
parent a127399f5e
commit 817fccb3e5

View File

@ -600,6 +600,9 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
if (!lr.isTable ()) { if (!lr.isTable ()) {
return; return;
} }
int row_count = 0;
for (luabridge::Iterator i (lr); !i.isNil (); ++i) { for (luabridge::Iterator i (lr); !i.isNil (); ++i) {
if (!i.key ().isNumber ()) { continue; } if (!i.key ().isNumber ()) { continue; }
if (!i.value ().isTable ()) { continue; } if (!i.value ().isTable ()) { continue; }
@ -755,6 +758,7 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
} }
_widgets.push_back(w); _widgets.push_back(w);
} }
row_count++;
} }
_ad.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); _ad.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@ -763,14 +767,18 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
Gtk::Table* table = Gtk::manage (new Gtk::Table ()); Gtk::Table* table = Gtk::manage (new Gtk::Table ());
table->set_col_spacings (20); table->set_col_spacings (20);
table->set_row_spacings (8); table->set_row_spacings (8);
table->set_border_width (8);
table->signal_size_allocate ().connect (sigc::mem_fun (this, &Dialog::table_size_alloc)); table->signal_size_allocate ().connect (sigc::mem_fun (this, &Dialog::table_size_alloc));
_scroller.set_shadow_type(Gtk::SHADOW_NONE); if (row_count>16) {
_scroller.set_border_width(0); _scroller.set_shadow_type(Gtk::SHADOW_NONE);
_scroller.add (*table); _scroller.set_border_width(0);
_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER); _scroller.add (*table);
_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
_ad.get_vbox ()->pack_start (_scroller); _ad.get_vbox ()->pack_start (_scroller);
} else {
_ad.get_vbox ()->pack_start (*table);
}
int row = 0; int row = 0;
int last_end = -1; int last_end = -1;