From f5868e767fd2e51ea80f06cde3ac82b6c0488315 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 28 Aug 2020 13:04:31 +0900 Subject: [PATCH] DSWindowShell: make sendConfigure method be a private method Change-Id: I0d539c18a74c93fac6d53d1f6a2b072651f0ca9c --- src/DSWindowShell/DSWindowShell.cpp | 8 -------- src/DSWindowShell/DSWindowShell.h | 2 -- src/DSWindowShell/DSWindowShellPrivate.cpp | 6 +++--- src/DSWindowShell/DSWindowShellPrivate.h | 6 +++--- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/DSWindowShell/DSWindowShell.cpp b/src/DSWindowShell/DSWindowShell.cpp index 8b9a78b..6798b79 100644 --- a/src/DSWindowShell/DSWindowShell.cpp +++ b/src/DSWindowShell/DSWindowShell.cpp @@ -372,12 +372,4 @@ bool DSWindowShell::getVkbdFloating() return priv->getVkbdFloating(); } -void DSWindowShell::sendConfigure(void) -{ - DS_GET_PRIV(DSWindowShell); - - priv->sendConfigure(); -} - - } // namespace display_server diff --git a/src/DSWindowShell/DSWindowShell.h b/src/DSWindowShell/DSWindowShell.h index 7690094..f2452f7 100644 --- a/src/DSWindowShell/DSWindowShell.h +++ b/src/DSWindowShell/DSWindowShell.h @@ -116,8 +116,6 @@ public: bool setVkbdFloating(bool set); bool getVkbdFloating(); - void sendConfigure(void); - protected: private: diff --git a/src/DSWindowShell/DSWindowShellPrivate.cpp b/src/DSWindowShell/DSWindowShellPrivate.cpp index 65778c3..7435cbf 100644 --- a/src/DSWindowShell/DSWindowShellPrivate.cpp +++ b/src/DSWindowShell/DSWindowShellPrivate.cpp @@ -276,7 +276,7 @@ void DSWindowShellPrivate::setShellSurface(IDSWaylandShellSurface *shellSurface) { __shellSurface = shellSurface; DSLOG_DBG("DSWindowShell", "Set ShellSurface(%p). Send configure", shellSurface); - sendConfigure(); + __sendConfigure(); } IDSWaylandShellSurface *DSWindowShellPrivate::getShellSurface(void) @@ -647,7 +647,7 @@ bool DSWindowShellPrivate::getVkbdFloating() return false; } -void DSWindowShellPrivate::sendConfigure(void) +void DSWindowShellPrivate::__sendConfigure(void) { if (__shellSurface) { @@ -667,7 +667,7 @@ void DSWindowShellPrivate::__onWindowBufferChanged(std::shared_ptr bu { std::shared_ptr bufferSize = buffer->getSize(); DSLOG_DBG("DSWindow", "Geometry Changed!!! Send Configure... geo(%d,%d,%d,%d) commit(%d,%d)", __x, __y, __w, __h, bufferSize->w, bufferSize->h); - sendConfigure(); + __sendConfigure(); __changedGeometry = false; } diff --git a/src/DSWindowShell/DSWindowShellPrivate.h b/src/DSWindowShell/DSWindowShellPrivate.h index 5057859..1d1924c 100644 --- a/src/DSWindowShell/DSWindowShellPrivate.h +++ b/src/DSWindowShell/DSWindowShellPrivate.h @@ -120,18 +120,18 @@ public: bool setVkbdFloating(bool set); bool getVkbdFloating(); - void sendConfigure(void); - private: bool __create(int x, int y, unsigned int w, unsigned int h, DSWindowShell *pWin, DSWindowShell *pParent); bool __findInChildList(DSWindowShell *parentWinShell); bool __setParent(DSWindowShell *parentWinShell); - void __onWindowBufferChanged(std::shared_ptr buffer); + void __sendConfigure(void); struct stWindowAuxHint* __findAuxHint(int32_t id); void __handleAuxHint(stWindowAuxHint *hint); bool __handleUserGeometryHint(bool setUserGeometry); + void __onWindowBufferChanged(std::shared_ptr buffer); + private: DSWindow *__window; IDSWaylandShellSurface *__shellSurface; -- 2.7.4