mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Add Rectangle.origin and Rectangle.size properties

Browse Source
This commit is contained in:
David Capello 2022-12-20 18:04:51 -03:00
parent f50bbff5d4
commit 4d880bd5b7
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/app/script/rectangle_class.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2019 Igara Studio S.A.
// Copyright (C) 2019-2022 Igara Studio S.A.
// Copyright (C) 2017-2018 David Capello
//
// This program is distributed under the terms of
@ -9,10 +9,12 @@
#include "config.h"
#endif
#include "app/script/engine.h"
#include "app/script/luacpp.h"
#include "fmt/format.h"
#include "gfx/point.h"
#include "gfx/rect.h"
#include "gfx/size.h"
namespace app {
namespace script {
@ -92,8 +94,12 @@ int Rectangle_tostring(lua_State* L)
int Rectangle_contains(lua_State* L)
{
const auto a = get_obj<gfx::Rect>(L, 1);
const auto b = get_obj<gfx::Rect>(L, 2);
lua_pushboolean(L, a->contains(*b));
if (const auto b = may_get_obj<gfx::Rect>(L, 2))
lua_pushboolean(L, a->contains(*b));
else if (const auto b = may_get_obj<gfx::Point>(L, 2))
lua_pushboolean(L, a->contains(*b));
else
lua_pushboolean(L, false);
return 1;
}
@ -149,6 +155,20 @@ int Rectangle_get_height(lua_State* L)
return 1;
}
int Rectangle_get_origin(lua_State* L)
{
const auto rc = get_obj<gfx::Rect>(L, 1);
push_obj(L, rc->origin());
return 1;
}
int Rectangle_get_size(lua_State* L)
{
const auto rc = get_obj<gfx::Rect>(L, 1);
push_obj(L, rc->size());
return 1;
}
int Rectangle_set_x(lua_State* L)
{
auto rc = get_obj<gfx::Rect>(L, 1);
@ -177,6 +197,22 @@ int Rectangle_set_height(lua_State* L)
return 0;
}
int Rectangle_set_origin(lua_State* L)
{
const auto rc = get_obj<gfx::Rect>(L, 1);
const auto pt = convert_args_into_point(L, 2);
rc->setOrigin(pt);
return 0;
}
int Rectangle_set_size(lua_State* L)
{
const auto rc = get_obj<gfx::Rect>(L, 1);
const auto sz = convert_args_into_size(L, 2);
rc->setSize(sz);
return 0;
}
int Rectangle_get_isEmpty(lua_State* L)
{
const auto rc = get_obj<gfx::Rect>(L, 1);
@ -202,6 +238,8 @@ const Property Rectangle_properties[] = {
{ "y", Rectangle_get_y, Rectangle_set_y },
{ "width", Rectangle_get_width, Rectangle_set_width },
{ "height", Rectangle_get_height, Rectangle_set_height },
{ "origin", Rectangle_get_origin, Rectangle_set_origin },
{ "size", Rectangle_get_size, Rectangle_set_size },
{ "isEmpty", Rectangle_get_isEmpty, nullptr },
{ nullptr, nullptr, nullptr }
};

14
tests/scripts/rectangle.lua
View File

@ -16,6 +16,8 @@ assert(rc.x == 1)
assert(rc.y == 2)
assert(rc.width == 3)
assert(rc.height == 4)
assert(rc.origin == Point(1, 2))
assert(rc.size == Size(3, 4))
assert(not rc.isEmpty)
assert("Rectangle{ x=1, y=2, width=3, height=4 }" == tostring(rc))
@ -34,6 +36,18 @@ assert(rc.y == 6)
assert(rc.width == 7)
assert(rc.height == 8)
rc.origin = Point(10, 12)
assert(rc.x == 10)
assert(rc.y == 12)
assert(rc.width == 7)
assert(rc.height == 8)
rc.size = Size(32, 64)
assert(rc.x == 10)
assert(rc.y == 12)
assert(rc.width == 32)
assert(rc.height == 64)
rc = Rectangle{x=2, y=3, width=4, height=5}
assert(rc.x == 2)
assert(rc.y == 3)