diff options
author | Juho Annunen <juho.annunen@qt.io> | 2017-10-11 13:30:52 +0300 |
---|---|---|
committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 10:40:45 +0000 |
commit | 3895b8504f65346a1de19aa1ceb9570175337283 (patch) | |
tree | 3c97b2b57874bc1d3932350b4db7a779ddd80840 /src/displaysettings/displaysettings_p.h | |
parent | 61e9e8c83e817b3692beae03bd8e683d247207b0 (diff) |
Update API and settings UI
Implemented new UI design for Settings and minor changes to API
Task-number: QTBUG-63091
Change-Id: Id72e20b53bc33ca0a3068d1e9b664fc5836a1cda
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/displaysettings/displaysettings_p.h')
-rw-r--r-- | src/displaysettings/displaysettings_p.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h index 329ed81..089777c 100644 --- a/src/displaysettings/displaysettings_p.h +++ b/src/displaysettings/displaysettings_p.h @@ -52,7 +52,10 @@ public: virtual ~PhysicalScreenSize(); void setSize(int inches); + void setSizeMm(int widthMm, int heightMm); int size() const { return physScreenSizeInch; } + int widthMm() const { return physScreenWidthMm; } + int heightMm() const { return physScreenHeightMm; } bool enabled() const; void setEnabled(bool enable); @@ -66,6 +69,8 @@ private: bool physScreenSizeEnabled; int physScreenSizeInch; + int physScreenWidthMm; + int physScreenHeightMm; QTimer physWriteTimer; }; @@ -85,16 +90,22 @@ public: DisplaySettingsPrivate(DisplaySettings* qq); int displayBrightness(); int physicalScreenSizeInch() const; + int physicalScreenWidthMm() const; + int physicalScreenHeightMm() const; bool physicalScreenSizeOverride() const; bool setDisplayBrightness(int value); void setPhysicalScreenSizeInch(int inches); + void setPhysicalScreenWidthMm(int newWidth); + void setPhysicalScreenHeightMm(int newHeight); void setPhysicalScreenSizeOverride(bool enable); private: void initLightDevices(); DisplaySettings *q_ptr; int m_brightness; int m_screenSizeInch; + int m_screenWidthMm; + int m_screenHeightMm; bool m_sizeOverride; QList<LightDevice> m_lightDevices; bool m_lightDevicesInitialized; |