mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Fix using Dialog.bounds property with multiple windows

Browse Source 
Fixes for:
https://community.aseprite.org/t/9277
https://steamcommunity.com/app/431730/discussions/0/3091137796288948505/
This commit is contained in:
David Capello 2021-06-07 17:39:12 -03:00
parent fb88a5c1f1
commit 06a387fd45
1 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,11 +19,13 @@
#include "app/ui/color_shades.h"
#include "app/ui/expr_entry.h"
#include "app/ui/filename_field.h"
#include "app/ui/main_window.h"
#include "base/paths.h"
#include "base/remove_from_container.h"
#include "ui/box.h"
#include "ui/button.h"
#include "ui/combobox.h"
#include "ui/display.h"
#include "ui/entry.h"
#include "ui/grid.h"
#include "ui/label.h"
@ -133,6 +135,37 @@ struct Dialog {
it->second->setText(text);
}
gfx::Rect getWindowBounds() const {
gfx::Rect bounds = window.bounds();
// Bounds in scripts will be relative to the the main window
// origin/scale.
if (window.ownDisplay()) {
const auto mainWindow = App::instance()->mainWindow();
const int scale = mainWindow->display()->scale();
const gfx::Point dialogOrigin = window.display()->nativeWindow()->contentRect().origin();
const gfx::Point mainOrigin = mainWindow->display()->nativeWindow()->contentRect().origin();
bounds.setOrigin((dialogOrigin - mainOrigin) / scale);
}
return bounds;
}
void setWindowBounds(const gfx::Rect& rc) {
if (window.ownDisplay()) {
window.expandWindow(rc.size());
const auto mainWindow = App::instance()->mainWindow();
const int scale = mainWindow->display()->scale();
const gfx::Point mainOrigin = mainWindow->display()->nativeWindow()->contentRect().origin();
gfx::Rect frame = window.display()->nativeWindow()->contentRect();
frame.setOrigin(mainOrigin + rc.origin() * scale);
window.display()->nativeWindow()->setFrame(frame);
}
else {
window.setBounds(rc);
window.invalidate();
}
}
};
template<typename...Args,
@ -255,6 +288,7 @@ int Dialog_show(lua_State* L)
dlg->refShow(L);
bool wait = true;
obs::scoped_connection conn;
if (lua_istable(L, 2)) {
int type = lua_getfield(L, 2, "wait");
if (type == LUA_TBOOLEAN)
@ -265,8 +299,9 @@ int Dialog_show(lua_State* L)
if (VALID_LUATYPE(type)) {
const auto rc = convert_args_into_rect(L, -1);
if (!rc.isEmpty()) {
dlg->window.remapWindow();
dlg->window.setBounds(rc);
conn = dlg->window.Open.connect([dlg, rc]{
dlg->setWindowBounds(rc);
});
}
}
lua_pop(L, 1);
@ -988,12 +1023,9 @@ int Dialog_modify(lua_State* L)
if (relayout) {
dlg->window.layout();
gfx::Rect origBounds = dlg->window.bounds();
gfx::Rect bounds = origBounds;
bounds.h = dlg->window.sizeHint().h;
dlg->window.setBounds(bounds);
dlg->window.manager()->invalidateRect(origBounds);
gfx::Rect bounds(dlg->window.bounds().w,
dlg->window.sizeHint().h);
dlg->window.expandWindow(bounds.size());
}
}
lua_pushvalue(L, 1);
@ -1183,7 +1215,8 @@ int Dialog_get_bounds(lua_State* L)
auto dlg = get_obj<Dialog>(L, 1);
if (!dlg->window.isVisible())
dlg->window.remapWindow();
push_new<gfx::Rect>(L, dlg->window.bounds());
push_new<gfx::Rect>(L, dlg->getWindowBounds());
return 1;
}
@ -1191,9 +1224,9 @@ int Dialog_set_bounds(lua_State* L)
{
auto dlg = get_obj<Dialog>(L, 1);
const auto rc = get_obj<gfx::Rect>(L, 2);
if (*rc != dlg->window.bounds()) {
dlg->window.setBounds(*rc);
dlg->window.invalidate();
if (rc) {
if (*rc != dlg->getWindowBounds())
dlg->setWindowBounds(*rc);
}
return 0;
}