diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-16 11:36:01 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-16 11:36:01 +0300 |
| commit | c2fbe46b0f0fde44b8a40d89601a195da27d28fb (patch) | |
| tree | f66e3e50758acb36001e2774c6e4ede5fc8bead6 /intern/ghost/intern/GHOST_WindowX11.h | |
| parent | 386ba094988fc793f8e060d15438566e5e2d2cae (diff) | |
| parent | dcf57e34f3866bba5ddd9cfdfe858a1a5eedc4c2 (diff) | |
Merge branch 'master' into temp-gpencil-drw-enginetemp-gpencil-drw-engine
Diffstat (limited to 'intern/ghost/intern/GHOST_WindowX11.h')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index 0b8fe3a3a41..faf3acba234 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -75,8 +75,9 @@ class GHOST_WindowX11 : public GHOST_Window { GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, - const GHOST_TEmbedderWindowID parentWindow, + GHOST_WindowX11 *parentWindow, GHOST_TDrawingContextType type = GHOST_kDrawingContextTypeNone, + const bool is_dialog = false, const bool stereoVisual = false, const bool exclusive = false, const bool alphaBackground = false, @@ -92,6 +93,8 @@ class GHOST_WindowX11 : public GHOST_Window { void getClientBounds(GHOST_Rect &bounds) const; + bool isDialog() const; + GHOST_TSuccess setClientWidth(GHOST_TUns32 width); GHOST_TSuccess setClientHeight(GHOST_TUns32 height); @@ -185,6 +188,8 @@ class GHOST_WindowX11 : public GHOST_Window { GHOST_TSuccess endFullScreen() const; + GHOST_TSuccess setDialogHints(GHOST_WindowX11 *parentWindow); + GHOST_TUns16 getDPIHint(); protected: |