feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Lua: Fix Widget size property implementation

Browse Source 
Change-Id: Ia5d9d8646815257318ad657480167b7f42b9dca9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-06-06 07:50:39 +02:00
parent f64232f77b
commit 7e9af008fc
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/lua/bindings/gui.cpp
View File

@@ -93,10 +93,21 @@ HAS_MEM_FUNC(onClicked, hasOnClicked);
HAS_MEM_FUNC(setText, hasSetText); HAS_MEM_FUNC(setText, hasSetText);
HAS_MEM_FUNC(setTitle, hasSetTitle); HAS_MEM_FUNC(setTitle, hasSetTitle);
HAS_MEM_FUNC(setValue, hasSetValue); HAS_MEM_FUNC(setValue, hasSetValue);
HAS_MEM_FUNC(setSize, hasSetSize);
template<class T> template<class T>
void setProperties(std::unique_ptr<T> &item, const sol::table &children, QObject *guard) void setProperties(std::unique_ptr<T> &item, const sol::table &children, QObject *guard)
{ {
if constexpr (hasSetSize<T, void (T::*)(int, int)>::value) {
sol::optional<sol::table> size = children.get<sol::optional<sol::table>>("size");
if (size) {
if (size->size() == 2)
item->setSize(size->get<int>(1), size->get<int>(2));
else
throw sol::error("size must have exactly two elements");
}
}
if constexpr (hasOnTextChanged<T, void (T::*)(const QString &)>::value) { if constexpr (hasOnTextChanged<T, void (T::*)(const QString &)>::value) {
sol::optional<sol::protected_function> onTextChanged sol::optional<sol::protected_function> onTextChanged
= children.get<sol::optional<sol::protected_function>>("onTextChanged"); = children.get<sol::optional<sol::protected_function>>("onTextChanged");
@@ -233,8 +244,7 @@ void addGuiModule()
gui.new_usertype<Space>("Space", sol::call_constructor, sol::constructors<Space(int)>()); gui.new_usertype<Space>("Space", sol::call_constructor, sol::constructors<Space(int)>());
gui.new_usertype<Stretch>( gui.new_usertype<Stretch>("Stretch", sol::call_constructor, sol::constructors<Stretch(int)>());
"Stretch", sol::call_constructor, sol::constructors<Stretch(int)>());
// Layouts // Layouts
gui.new_usertype<Layout>( gui.new_usertype<Layout>(
@@ -306,8 +316,6 @@ void addGuiModule()
}), }),
"show", "show",
&Widget::show, &Widget::show,
"setSize",
&Widget::setSize,
sol::base_classes, sol::base_classes,
sol::bases<Object, Thing>()); sol::bases<Object, Thing>());