From 575368129b1a5bd80690492ed96f08e9a755caea Mon Sep 17 00:00:00 2001
From: "alexandr.mruchok" <alexandr.mruchok@demlabs.net>
Date: Fri, 14 Feb 2020 12:33:13 +0200
Subject: [PATCH] [+] MultiScreenWindow::screen(),
MultiScreenWindow::activateScreen()
---
controls/AdaptiveWidget.h | 6 +++---
screens/MultiScreenWindow.h | 20 ++++++++++++++++++++
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/controls/AdaptiveWidget.h b/controls/AdaptiveWidget.h
index 338c770..0d64767 100644
--- a/controls/AdaptiveWidget.h
+++ b/controls/AdaptiveWidget.h
@@ -47,10 +47,10 @@ protected:
template <class T /*= QWidget*/>
inline QList<T*> getTheSameWidgets(const QString& a_objName)
{
- QList<T*> widgets;
+ QList<T*> widgetsList;
T* foundWidget = currentWidget()->findChild<T*>(a_objName);
if (foundWidget)
- widgets.append(foundWidget);
+ widgetsList.append(foundWidget);
///TODO: add horisontal rotation for mobile.
@@ -60,7 +60,7 @@ protected:
// if (foundWidget)
// widgets.append(foundWidget);
// }
- return widgets;
+ return widgetsList;
}
template <class T /*= QWidget*/>
diff --git a/screens/MultiScreenWindow.h b/screens/MultiScreenWindow.h
index 40453d9..79a3e9f 100644
--- a/screens/MultiScreenWindow.h
+++ b/screens/MultiScreenWindow.h
@@ -15,8 +15,28 @@ public:
MultiScreenAbstract* m_centralScreen;
QString activeScreenName();
+
+ template <typename T>
+ T* screen();
+
+ template <typename T>
+ T* activateScreen();
+
private:
QString m_activeScreen;
};
+
+template <typename T>
+T* MultiScreenWindow::screen(){
+ return this->centralScreen()->subScreen<T>();
+}
+
+template <typename T>
+T* MultiScreenWindow::activateScreen()
+{
+ return this->centralScreen()->activateScreen<T>();
+}
+
+
#endif // MULTISCREENWINDOW_H
--
GitLab