From d2b2699e1419bdc99d53f16d01047fd1bf1e32ab Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Fri, 8 Aug 2014 13:48:31 +0200
Subject: [PATCH] Replace usage of Item.window with Window attached property
Change-Id: Ic33d645ba384697f761540e277507ad56617e2fb
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---
src/controls/Styles/Android/ButtonStyle.qml | 4 ++--
src/controls/Styles/Android/CalendarStyle.qml | 12 ++++++------
src/controls/Styles/Android/CheckBoxStyle.qml | 4 ++--
src/controls/Styles/Android/ComboBoxStyle.qml | 4 ++--
src/controls/Styles/Android/CursorHandleStyle.qml | 2 +-
src/controls/Styles/Android/GroupBoxStyle.qml | 5 +++--
src/controls/Styles/Android/RadioButtonStyle.qml | 4 ++--
src/controls/Styles/Android/ScrollViewStyle.qml | 4 ++--
src/controls/Styles/Android/SliderStyle.qml | 2 +-
src/controls/Styles/Android/SpinBoxStyle.qml | 4 ++--
src/controls/Styles/Android/SwitchStyle.qml | 6 +++---
src/controls/Styles/Android/TabViewStyle.qml | 8 ++++----
src/controls/Styles/Android/TableViewStyle.qml | 8 ++++----
src/controls/Styles/Android/TextAreaStyle.qml | 2 +-
src/controls/Styles/Android/TextFieldStyle.qml | 4 ++--
src/controls/Styles/Android/ToolBarStyle.qml | 2 +-
src/controls/Styles/Android/ToolButtonStyle.qml | 6 +++---
17 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/src/controls/Styles/Android/ButtonStyle.qml b/src/controls/Styles/Android/ButtonStyle.qml
index 619b5eff6..2a1080513 100644
--- a/src/controls/Styles/Android/ButtonStyle.qml
+++ b/src/controls/Styles/Android/ButtonStyle.qml
@@ -70,7 +70,7 @@ Style {
pressed: control.pressed
checked: control.checked
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.View_background
}
@@ -97,7 +97,7 @@ Style {
pressed: control.pressed
focused: control.activeFocus
selected: control.checked
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef
Layout.fillWidth: true
}
diff --git a/src/controls/Styles/Android/CalendarStyle.qml b/src/controls/Styles/Android/CalendarStyle.qml
index 7d872ed81..0b917bdae 100644
--- a/src/controls/Styles/Android/CalendarStyle.qml
+++ b/src/controls/Styles/Android/CalendarStyle.qml
@@ -65,7 +65,7 @@ CalendarStyle {
id: navigationBar
text: styleData.title
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.calendarViewStyle
width: parent.width - prevButton.width - nextButton.width
height: parent.height
@@ -85,7 +85,7 @@ CalendarStyle {
anchors.centerIn: parent
text: control.__locale.dayName(styleData.dayOfWeek, control.dayOfWeekFormat)
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.calendarViewStyle.CalendarView_weekDayTextAppearance
}
}
@@ -98,7 +98,7 @@ CalendarStyle {
anchors.centerIn: parent
text: styleData.weekNumber
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.calendarViewStyle
color: AndroidStyle.colorValue(styleDef.CalendarView_weekNumberColor)
}
@@ -116,7 +116,7 @@ CalendarStyle {
DrawableLoader {
height: parent.height
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
active: styleData.selected
styleDef: AndroidStyle.styleDef.calendarViewStyle.CalendarView_selectedDateVerticalBar
width: 6 // UNSCALED_SELECTED_DATE_VERTICAL_BAR_WIDTH
@@ -125,7 +125,7 @@ CalendarStyle {
DrawableLoader {
height: parent.height
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
anchors.right: parent.right
active: styleData.selected
styleDef: AndroidStyle.styleDef.calendarViewStyle.CalendarView_selectedDateVerticalBar
@@ -139,7 +139,7 @@ CalendarStyle {
pressed: styleData.pressed
selected: styleData.selected
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.calendarViewStyle.CalendarView_dateTextAppearance
color: styleData.valid && styleData.visibleMonth ? AndroidStyle.colorValue(AndroidStyle.styleDef.calendarViewStyle.CalendarView_focusedMonthDateColor)
: AndroidStyle.colorValue(AndroidStyle.styleDef.calendarViewStyle.CalendarView_unfocusedMonthDateColor)
diff --git a/src/controls/Styles/Android/CheckBoxStyle.qml b/src/controls/Styles/Android/CheckBoxStyle.qml
index 9abe76d03..908665d01 100644
--- a/src/controls/Styles/Android/CheckBoxStyle.qml
+++ b/src/controls/Styles/Android/CheckBoxStyle.qml
@@ -63,7 +63,7 @@ Style {
pressed: control.pressed
checked: control.checked
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.CompoundButton_button
anchors.verticalCenter: parent.verticalCenter
}
@@ -74,7 +74,7 @@ Style {
pressed: control.pressed
focused: control.activeFocus
selected: control.checked
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef
anchors.fill: parent
diff --git a/src/controls/Styles/Android/ComboBoxStyle.qml b/src/controls/Styles/Android/ComboBoxStyle.qml
index 025231c43..715dd9f69 100644
--- a/src/controls/Styles/Android/ComboBoxStyle.qml
+++ b/src/controls/Styles/Android/ComboBoxStyle.qml
@@ -81,7 +81,7 @@ Style {
anchors.fill: parent
pressed: control.pressed
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.View_background
}
@@ -91,7 +91,7 @@ Style {
visible: !control.editable
pressed: control.pressed
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef
anchors.fill: bg
diff --git a/src/controls/Styles/Android/CursorHandleStyle.qml b/src/controls/Styles/Android/CursorHandleStyle.qml
index 8f1cff4f3..97b9fe857 100644
--- a/src/controls/Styles/Android/CursorHandleStyle.qml
+++ b/src/controls/Styles/Android/CursorHandleStyle.qml
@@ -54,7 +54,7 @@ DrawableLoader {
pressed: styleData.pressed
focused: control.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
Connections {
target: editor
diff --git a/src/controls/Styles/Android/GroupBoxStyle.qml b/src/controls/Styles/Android/GroupBoxStyle.qml
index d974635e8..b7346ea43 100644
--- a/src/controls/Styles/Android/GroupBoxStyle.qml
+++ b/src/controls/Styles/Android/GroupBoxStyle.qml
@@ -38,6 +38,7 @@
**
****************************************************************************/
import QtQuick 2.2
+import QtQuick.Window 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles.Android 1.0
@@ -98,7 +99,7 @@ GroupBoxStyle {
checked: control.checked
pressed: check.pressed
focused: check.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.checkboxStyle.CompoundButton_button
anchors.verticalCenter: label.verticalCenter
width: control.checkable ? item.implicitWidth : 0
@@ -110,7 +111,7 @@ GroupBoxStyle {
pressed: check.pressed
selected: control.checked
focused: check.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.checkboxStyle
anchors.top: parent.top
diff --git a/src/controls/Styles/Android/RadioButtonStyle.qml b/src/controls/Styles/Android/RadioButtonStyle.qml
index b8447ad62..76b2c9b7c 100644
--- a/src/controls/Styles/Android/RadioButtonStyle.qml
+++ b/src/controls/Styles/Android/RadioButtonStyle.qml
@@ -63,7 +63,7 @@ Style {
pressed: control.pressed
checked: control.checked
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.CompoundButton_button
anchors.verticalCenter: parent.verticalCenter
}
@@ -74,7 +74,7 @@ Style {
pressed: control.pressed
focused: control.activeFocus
selected: control.checked
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef
anchors.fill: parent
diff --git a/src/controls/Styles/Android/ScrollViewStyle.qml b/src/controls/Styles/Android/ScrollViewStyle.qml
index 0105b9cb4..3a0267591 100644
--- a/src/controls/Styles/Android/ScrollViewStyle.qml
+++ b/src/controls/Styles/Android/ScrollViewStyle.qml
@@ -73,7 +73,7 @@ ScrollViewStyle {
styleDef: styleData.horizontal ? AndroidStyle.styleDef.scrollViewStyle.View_scrollbarTrackHorizontal
: AndroidStyle.styleDef.scrollViewStyle.View_scrollbarTrackVertical
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
}
}
@@ -82,6 +82,6 @@ ScrollViewStyle {
: AndroidStyle.styleDef.scrollViewStyle.View_scrollbarThumbVertical
pressed: styleData.pressed
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
}
}
diff --git a/src/controls/Styles/Android/SliderStyle.qml b/src/controls/Styles/Android/SliderStyle.qml
index cca431434..1b160ffcc 100644
--- a/src/controls/Styles/Android/SliderStyle.qml
+++ b/src/controls/Styles/Android/SliderStyle.qml
@@ -84,7 +84,7 @@ Style {
id: thumb
pressed: control.pressed
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.SeekBar_thumb
x: Math.round((control.__handlePos - control.minimumValue) / (control.maximumValue - control.minimumValue) * ((horizontal ? panel.width : panel.height) - thumb.width))
}
diff --git a/src/controls/Styles/Android/SpinBoxStyle.qml b/src/controls/Styles/Android/SpinBoxStyle.qml
index cbd52c586..86fce0349 100644
--- a/src/controls/Styles/Android/SpinBoxStyle.qml
+++ b/src/controls/Styles/Android/SpinBoxStyle.qml
@@ -68,7 +68,7 @@ Style {
id: bg
anchors.fill: parent
focused: control.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: panel.styleDef.View_background
}
@@ -93,7 +93,7 @@ Style {
visible: false
text: control.__text
focused: control.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: panel.styleDef
}
}
diff --git a/src/controls/Styles/Android/SwitchStyle.qml b/src/controls/Styles/Android/SwitchStyle.qml
index 13bbd3565..4c36c918e 100644
--- a/src/controls/Styles/Android/SwitchStyle.qml
+++ b/src/controls/Styles/Android/SwitchStyle.qml
@@ -72,7 +72,7 @@ SwitchStyle {
pressed: control.pressed
checked: control.checked
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.Switch_track
}
@@ -114,7 +114,7 @@ SwitchStyle {
pressed: control.pressed
checked: control.checked
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.Switch_thumb
}
@@ -125,7 +125,7 @@ SwitchStyle {
pressed: control.pressed
focused: control.activeFocus
selected: control.checked
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.Switch_switchTextAppearance
anchors.fill: parent
diff --git a/src/controls/Styles/Android/TabViewStyle.qml b/src/controls/Styles/Android/TabViewStyle.qml
index 6ce1e4bb2..107ac8537 100644
--- a/src/controls/Styles/Android/TabViewStyle.qml
+++ b/src/controls/Styles/Android/TabViewStyle.qml
@@ -71,7 +71,7 @@ Style {
id: loader
anchors.fill: parent
focused: control.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: panel.styleDef.ActionBar_backgroundStacked
}
}
@@ -94,7 +94,7 @@ Style {
pressed: styleData.pressed
selected: styleData.selected
focused: styleData.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: AndroidStyle.styleDef.actionBarTabStyle.View_background
}
@@ -107,7 +107,7 @@ Style {
pressed: styleData.pressed
selected: styleData.selected
focused: styleData.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: AndroidStyle.styleDef.actionBarTabBarStyle.LinearLayout_divider
visible: styleData.index < control.count - 1 && control.count > 1
}
@@ -119,7 +119,7 @@ Style {
enabled: styleData.enabled
focused: styleData.activeFocus
selected: styleData.selected
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.actionBarTabTextStyle
anchors.fill: bg
diff --git a/src/controls/Styles/Android/TableViewStyle.qml b/src/controls/Styles/Android/TableViewStyle.qml
index dd352af44..2cf6745fd 100644
--- a/src/controls/Styles/Android/TableViewStyle.qml
+++ b/src/controls/Styles/Android/TableViewStyle.qml
@@ -68,7 +68,7 @@ ScrollViewStyle {
DrawableLoader {
id: bg
anchors.fill: parent
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: parent.styleDef.View_background
}
@@ -77,7 +77,7 @@ ScrollViewStyle {
text: styleData.value !== undefined ? styleData.value : ""
horizontalAlignment: styleData.textAlignment
pressed: styleData.pressed
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: parent.styleDef
anchors.fill: parent
anchors.leftMargin: paddingStart
@@ -97,7 +97,7 @@ ScrollViewStyle {
pressed: styleData.pressed
checked: styleData.selected
selected: styleData.selected
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.simple_selectable_list_item.View_background
}
@@ -128,7 +128,7 @@ ScrollViewStyle {
pressed: styleData.pressed
focused: control.activeFocus
selected: styleData.selected
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: parent.styleDef
anchors.left: parent.left
anchors.right: parent.right
diff --git a/src/controls/Styles/Android/TextAreaStyle.qml b/src/controls/Styles/Android/TextAreaStyle.qml
index bd1e5956f..61ea9fb85 100644
--- a/src/controls/Styles/Android/TextAreaStyle.qml
+++ b/src/controls/Styles/Android/TextAreaStyle.qml
@@ -68,7 +68,7 @@ ScrollViewStyle {
visible: false
enabled: control.enabled
focused: control.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: style.styleDef
}
diff --git a/src/controls/Styles/Android/TextFieldStyle.qml b/src/controls/Styles/Android/TextFieldStyle.qml
index f56584430..e7eec32c6 100644
--- a/src/controls/Styles/Android/TextFieldStyle.qml
+++ b/src/controls/Styles/Android/TextFieldStyle.qml
@@ -66,7 +66,7 @@ Style {
id: bg
anchors.fill: parent
focused: control.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: panel.styleDef.View_background
}
@@ -86,7 +86,7 @@ Style {
visible: false
text: control.text
focused: control.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: panel.styleDef
}
}
diff --git a/src/controls/Styles/Android/ToolBarStyle.qml b/src/controls/Styles/Android/ToolBarStyle.qml
index 5592d7560..3446e7d44 100644
--- a/src/controls/Styles/Android/ToolBarStyle.qml
+++ b/src/controls/Styles/Android/ToolBarStyle.qml
@@ -70,7 +70,7 @@ Style {
id: bg
anchors.fill: parent
focused: control.activeFocus
- window_focused: focused && control.window && control.window.active
+ window_focused: focused && control.Window.active
styleDef: panel.styleDef.ActionBar_backgroundStacked
}
}
diff --git a/src/controls/Styles/Android/ToolButtonStyle.qml b/src/controls/Styles/Android/ToolButtonStyle.qml
index 3d415a4b9..33d922207 100644
--- a/src/controls/Styles/Android/ToolButtonStyle.qml
+++ b/src/controls/Styles/Android/ToolButtonStyle.qml
@@ -72,7 +72,7 @@ Style {
pressed: control.pressed
checked: control.checked
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef.View_background
}
@@ -99,7 +99,7 @@ Style {
pressed: control.pressed
focused: control.activeFocus
selected: control.checked
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: panel.styleDef
Layout.fillWidth: true
}
@@ -110,7 +110,7 @@ Style {
pressed: control.pressed
checked: control.checked
focused: control.activeFocus
- window_focused: control.window && control.window.active
+ window_focused: control.Window.active
styleDef: AndroidStyle.styleDef.actionOverflowButtonStyle.ImageView_src
Layout.alignment: Qt.AlignCenter
}
--
GitLab