ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
This reverts commit 817fccb3e5.
This commit is contained in:
Robin Gareus 2022-06-02 21:12:25 +02:00
parent 10bbcd167d
commit 2cef35247c
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/luadialog.cc
View File

@ -600,9 +600,6 @@ 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; }
@ -758,7 +755,6 @@ 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);
@ -767,18 +763,14 @@ 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));
if (row_count>16) { _scroller.set_shadow_type(Gtk::SHADOW_NONE);
_scroller.set_shadow_type(Gtk::SHADOW_NONE); _scroller.set_border_width(0);
_scroller.set_border_width(0); _scroller.add (*table);
_scroller.add (*table); _scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
_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;