mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Add Dialog:newrow{ always }

Browse Source
This commit is contained in:
David Capello 2020-04-16 11:48:44 -03:00
parent 7482024827
commit 48e941cb2f
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/script/dialog_class.cpp
View File

@ -51,6 +51,7 @@ struct Dialog {
ui::VBox vbox; ui::VBox vbox;
ui::Grid grid; ui::Grid grid;
ui::HBox* hbox = nullptr; ui::HBox* hbox = nullptr;
bool autoNewRow = false;
std::map<std::string, ui::Widget*> dataWidgets; std::map<std::string, ui::Widget*> dataWidgets;
std::map<std::string, ui::Widget*> labelWidgets; std::map<std::string, ui::Widget*> labelWidgets;
int currentRadioGroup = 0; int currentRadioGroup = 0;
@ -287,7 +288,8 @@ int Dialog_add_widget(lua_State* L, Widget* widget)
// This is to separate different kind of widgets without label in // This is to separate different kind of widgets without label in
// different rows. // different rows.
if (dlg->lastWidgetType != widget->type()) { if (dlg->lastWidgetType != widget->type() ||
dlg->autoNewRow) {
dlg->lastWidgetType = widget->type(); dlg->lastWidgetType = widget->type();
dlg->hbox = nullptr; dlg->hbox = nullptr;
} }
@ -345,6 +347,20 @@ int Dialog_newrow(lua_State* L)
{ {
auto dlg = get_obj<Dialog>(L, 1); auto dlg = get_obj<Dialog>(L, 1);
dlg->hbox = nullptr; dlg->hbox = nullptr;
dlg->autoNewRow = false;
if (lua_istable(L, 2)) {
// Dialog:newrow{ always }
const int type = lua_getfield(L, 2, "always");
if (type != LUA_TNONE) {
if (type == LUA_TNIL ||
lua_toboolean(L, -1)) {
dlg->autoNewRow = true;
}
lua_pop(L, 1);
}
}
lua_pushvalue(L, 1); lua_pushvalue(L, 1);
return 1; return 1;
} }