From eccb1ad7484eef9b588a430618071740dcd6fa20 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Fri, 31 Jul 2020 14:39:44 +0900 Subject: [PATCH] DSWindow: add setGeometry() func(s) Change-Id: I4c6df59415aa10ad8953ff5eef5c1742baf24256 Signed-off-by: Sung-Jin Park --- src/DSWindow/DSWindow.cpp | 20 ++++++++++++++++++++ src/DSWindow/DSWindow.h | 2 ++ tests/DSWindow-test.cpp | 22 +++++++++++++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/DSWindow/DSWindow.cpp b/src/DSWindow/DSWindow.cpp index a64c771..7c7fd88 100644 --- a/src/DSWindow/DSWindow.cpp +++ b/src/DSWindow/DSWindow.cpp @@ -178,4 +178,24 @@ stGeometry DSWindow::getGeometry() return geom; } +void DSWindow::setGeometry(int x, int y, unsigned int w, unsigned int h) +{ + DS_GET_PRIV(DSWindow); + + priv->__x = x; + priv->__y = y; + priv->__w = w; + priv->__h = h; +} + +void DSWindow::setGeometry(stGeometry geom) +{ + DS_GET_PRIV(DSWindow); + + priv->__x = geom.x; + priv->__y = geom.y; + priv->__w = geom.w; + priv->__h = geom.h; +} + } // namespace display_server \ No newline at end of file diff --git a/src/DSWindow/DSWindow.h b/src/DSWindow/DSWindow.h index 45181ee..ae8b222 100644 --- a/src/DSWindow/DSWindow.h +++ b/src/DSWindow/DSWindow.h @@ -35,6 +35,8 @@ public: bool hasFocus(void); stGeometry getGeometry(); + void setGeometry(int x, int y, unsigned int w, unsigned int h); + void setGeometry(stGeometry geom); protected: //virtual bool _onFocus(void); diff --git a/tests/DSWindow-test.cpp b/tests/DSWindow-test.cpp index 3f11ba4..99622e5 100644 --- a/tests/DSWindow-test.cpp +++ b/tests/DSWindow-test.cpp @@ -39,6 +39,26 @@ TEST_F(DSWindowTest, BasicMethods) EXPECT_TRUE(geom.w == 1); EXPECT_TRUE(geom.h == 1); + win->setGeometry(100, 100, 1280, 720); + geom = win->getGeometry(); + EXPECT_TRUE(geom.x == 100); + EXPECT_TRUE(geom.y == 100); + EXPECT_TRUE(geom.w == 1280); + EXPECT_TRUE(geom.h == 720); + + stGeometry sGeom; + sGeom.x = 50; + sGeom.y = 50; + sGeom.w = 700; + sGeom.h = 700; + win->setGeometry(sGeom); + + geom = win->getGeometry(); + EXPECT_TRUE(geom.x == sGeom.x); + EXPECT_TRUE(geom.y == sGeom.y); + EXPECT_TRUE(geom.w == sGeom.w); + EXPECT_TRUE(geom.h == sGeom.h); + EXPECT_TRUE(win->show() == true); EXPECT_TRUE(win->hide(true) == true); EXPECT_TRUE(win->showState() == 0); @@ -50,4 +70,4 @@ TEST_F(DSWindowTest, BasicMethods) EXPECT_TRUE(win->setFocus() == true); EXPECT_TRUE(win->hasFocus() == true); -} \ No newline at end of file +} -- 2.7.4