Syping/luaengineapp
1
0
Fork 0
mirror of https://gitlab.com/Syping/luaengineapp.git synced 2024-11-05 05:26:55 +01:00
Code Issues Projects Releases Wiki Activity

fixedSize improved and setWidgetSize

Browse source
This commit is contained in:
Syping 2018-08-27 01:37:12 +02:00
parent a6b8d15d19
commit d8c75c11a2
3 changed files with 51 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/luaengineapp/edit.lua
View file

@ -52,6 +52,7 @@ function main()
textEditor = createPlainTextEdit("", mainWidget) textEditor = createPlainTextEdit("", mainWidget)
layoutAddWidget(mainLayout, textEditor) layoutAddWidget(mainLayout, textEditor)
setWidgetSize(mainWindow, 650, 450)
showWidget(mainWindow, ShowNormal) showWidget(mainWindow, ShowNormal)
return GuiExecuted return GuiExecuted
end end

42
src/luaenginegui/luaengine/LuaEngineGui.cpp
View file

@ -70,9 +70,10 @@ void LuaEngineGui::pushClass(lua_State *L_p)
pushFunction(L_p, "executeWidget", executeWidget); pushFunction(L_p, "executeWidget", executeWidget);
pushFunction(L_p, "showWidget", showWidget); pushFunction(L_p, "showWidget", showWidget);
pushFunction(L_p, "getWidgetText", getWidgetText); pushFunction(L_p, "getWidgetText", getWidgetText);
pushFunction(L_p, "setWidgetFixedSize", setWidgetFixedSize); pushFunction(L_p, "setWidgetFixed", setWidgetFixed);
pushFunction(L_p, "setWidgetLayout", setWidgetLayout); pushFunction(L_p, "setWidgetLayout", setWidgetLayout);
pushFunction(L_p, "setWidgetText", setWidgetText); pushFunction(L_p, "setWidgetText", setWidgetText);
pushFunction(L_p, "setWidgetSize", setWidgetSize);
pushVariant(L_p, "ShowCurrent", 0); pushVariant(L_p, "ShowCurrent", 0);
pushVariant(L_p, "ShowNormal", 1); pushVariant(L_p, "ShowNormal", 1);
pushVariant(L_p, "ShowMinimised", 2); pushVariant(L_p, "ShowMinimised", 2);
@ -247,14 +248,19 @@ int LuaEngineGui::executeWidget(lua_State *L_p)
void *pointer = getPointer(L_p, 1); void *pointer = getPointer(L_p, 1);
if (pointer != NULL && ((QObject*)pointer)->inherits("QWidget")) { if (pointer != NULL && ((QObject*)pointer)->inherits("QWidget")) {
QVariant isFixed = ((QObject*)pointer)->property("isFixed"); QVariant isFixed = ((QObject*)pointer)->property("isFixed");
QVariant isSizeSet = ((QObject*)pointer)->property("isSizeSet");
if (isFixed.type() == QVariant::Bool && isFixed.toBool()) { if (isFixed.type() == QVariant::Bool && isFixed.toBool()) {
if (!(isSizeSet.type() == QVariant::Bool && isSizeSet.toBool())) {
((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint());
((QWidget*)pointer)->setMaximumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMaximumSize(((QWidget*)pointer)->sizeHint());
} }
}
else { else {
if (!(isSizeSet.type() == QVariant::Bool && isSizeSet.toBool())) {
((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint());
((QWidget*)pointer)->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); ((QWidget*)pointer)->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
} }
}
if (((QObject*)pointer)->inherits("QDialog")) { if (((QObject*)pointer)->inherits("QDialog")) {
((QDialog*)pointer)->exec(); ((QDialog*)pointer)->exec();
} }
@ -282,14 +288,19 @@ int LuaEngineGui::showWidget(lua_State *L_p)
showMode = getVariant(L_p, 2).toInt(); showMode = getVariant(L_p, 2).toInt();
} }
QVariant isFixed = ((QObject*)pointer)->property("isFixed"); QVariant isFixed = ((QObject*)pointer)->property("isFixed");
QVariant isSizeSet = ((QObject*)pointer)->property("isSizeSet");
if (isFixed.type() == QVariant::Bool && isFixed.toBool()) { if (isFixed.type() == QVariant::Bool && isFixed.toBool()) {
if (!(isSizeSet.type() == QVariant::Bool && isSizeSet.toBool())) {
((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint());
((QWidget*)pointer)->setMaximumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMaximumSize(((QWidget*)pointer)->sizeHint());
} }
}
else { else {
if (!(isSizeSet.type() == QVariant::Bool && isSizeSet.toBool())) {
((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint());
((QWidget*)pointer)->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); ((QWidget*)pointer)->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
} }
}
switch (showMode) { switch (showMode) {
case 1: case 1:
((QWidget*)pointer)->showNormal(); ((QWidget*)pointer)->showNormal();
@ -337,7 +348,7 @@ int LuaEngineGui::setMenuShortcut(lua_State *L_p)
return 0; return 0;
} }
int LuaEngineGui::setWidgetFixedSize(lua_State *L_p) int LuaEngineGui::setWidgetFixed(lua_State *L_p)
{ {
if (getArgumentCount(L_p) >= 1) { if (getArgumentCount(L_p) >= 1) {
void *pointer = getPointer(L_p, 1); void *pointer = getPointer(L_p, 1);
@ -347,10 +358,15 @@ int LuaEngineGui::setWidgetFixedSize(lua_State *L_p)
isFixed = getVariant(L_p, 2).toBool(); isFixed = getVariant(L_p, 2).toBool();
} }
((QObject*)pointer)->setProperty("isFixed", isFixed); ((QObject*)pointer)->setProperty("isFixed", isFixed);
QVariant isSizeSet = ((QObject*)pointer)->property("isSizeSet");
if (isFixed && ((QWidget*)pointer)->isVisible()) { if (isFixed && ((QWidget*)pointer)->isVisible()) {
((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint());
((QWidget*)pointer)->setMaximumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMaximumSize(((QWidget*)pointer)->sizeHint());
} }
else if (isFixed && (isSizeSet.type() == QVariant::Bool && isSizeSet.toBool())) {
((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->size());
((QWidget*)pointer)->setMaximumSize(((QWidget*)pointer)->size());
}
else if (((QWidget*)pointer)->isVisible()) { else if (((QWidget*)pointer)->isVisible()) {
((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint()); ((QWidget*)pointer)->setMinimumSize(((QWidget*)pointer)->sizeHint());
((QWidget*)pointer)->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); ((QWidget*)pointer)->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@ -376,6 +392,28 @@ int LuaEngineGui::setWidgetLayout(lua_State *L_p)
return 0; return 0;
} }
int LuaEngineGui::setWidgetSize(lua_State *L_p)
{
if (getArgumentCount(L_p) >= 3) {
void *pointer = getPointer(L_p, 1);
if (pointer != NULL && ((QObject*)pointer)->inherits("QWidget")) {
QVariant isFixed = ((QObject*)pointer)->property("isFixed");
if (isFixed.type() == QVariant::Bool && isFixed.toBool()) {
((QWidget*)pointer)->setMinimumSize(getVariant(L_p, 2).toInt(), getVariant(L_p, 3).toInt());
((QWidget*)pointer)->setMaximumSize(getVariant(L_p, 2).toInt(), getVariant(L_p, 3).toInt());
((QWidget*)pointer)->resize(getVariant(L_p, 2).toInt(), getVariant(L_p, 3).toInt());
((QObject*)pointer)->setProperty("isSizeSet", true);
}
else {
((QWidget*)pointer)->resize(getVariant(L_p, 2).toInt(), getVariant(L_p, 3).toInt());
((QObject*)pointer)->setProperty("isSizeSet", true);
}
return 0;
}
}
return 0;
}
int LuaEngineGui::setWidgetText(lua_State *L_p) int LuaEngineGui::setWidgetText(lua_State *L_p)
{ {
if (getArgumentCount(L_p) >= 2) { if (getArgumentCount(L_p) >= 2) {

3
src/luaenginegui/luaengine/LuaEngineGui.h
View file

@ -37,8 +37,9 @@ public:
static int showWidget(lua_State *L_p); static int showWidget(lua_State *L_p);
static int setLayoutMargins(lua_State *L_p); static int setLayoutMargins(lua_State *L_p);
static int setMenuShortcut(lua_State *L_p); static int setMenuShortcut(lua_State *L_p);
static int setWidgetFixedSize(lua_State *L_p); static int setWidgetFixed(lua_State *L_p);
static int setWidgetLayout(lua_State *L_p); static int setWidgetLayout(lua_State *L_p);
static int setWidgetSize(lua_State *L_p);
static int setWidgetText(lua_State *L_p); static int setWidgetText(lua_State *L_p);
static int layoutAddLayout(lua_State *L_p); static int layoutAddLayout(lua_State *L_p);
static int layoutAddWidget(lua_State *L_p); static int layoutAddWidget(lua_State *L_p);