From 3895b8504f65346a1de19aa1ceb9570175337283 Mon Sep 17 00:00:00 2001
From: Juho Annunen <juho.annunen@qt.io>
Date: Wed, 11 Oct 2017 13:30:52 +0300
Subject: 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>
---
 src/displaysettings/displaysettings_p.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/displaysettings/displaysettings_p.h')

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;
-- 
cgit v1.2.3