summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowsdl.h
diff options
context:
space:
mode:
authormobserveur <mobserveur@gmail.com>2024-06-18 10:19:08 +0200
committermobserveur <mobserveur@gmail.com>2024-06-18 10:19:08 +0200
commit7e11007cd6188fbdd93847596baf7b57a122e81d (patch)
tree095ee4337092146e880ad29bc8174c94daf2d174 /indra/llwindow/llwindowsdl.h
parent58d93108b48a878992e59992fb96605f684fed77 (diff)
SDL 2 Window completions and HiDPI support
This commit completes the SDL 2 support and adds HiDPI support for Mac.
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
-rw-r--r--indra/llwindow/llwindowsdl.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 0dbd94b1fe..9b5a1f2c61 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -36,6 +36,7 @@
#define SDL_DISABLE_IMMINTRIN_H
#endif
#include "SDL2/SDL.h"
+#include "SDL2/SDL_video.h"
#include "SDL2/SDL_endian.h"
#if LL_X11
@@ -121,6 +122,8 @@ public:
F32 getPixelAspectRatio() override;
void setNativeAspectRatio(F32 ratio) override { mOverrideAspectRatio = ratio; }
+ F32 getSystemUISize() override;
+
U32 getAvailableVRAMMegabytes() override;
void beforeDialog() override;
@@ -212,6 +215,7 @@ protected:
SDL_Cursor* mSDLCursors[UI_CURSOR_COUNT];
int mHaveInputFocus; /* 0=no, 1=yes, else unknown */
int mIsMinimized; /* 0=no, 1=yes, else unknown */
+ int mIsActive; /* 0=no, 1=yes, else unknown */
friend class LLWindowManager;
@@ -223,7 +227,7 @@ private:
#endif //LL_X11
U32 mKeyScanCode;
- U32 mKeyVirtualKey;
+ U32 mKeyVirtualKey;
Uint16 mKeyModifiers;
};