diff --git a/src/controls/Styles/Android/ButtonStyle.qml b/src/controls/Styles/Android/ButtonStyle.qml
index 619b5eff6f7e9413684194335f389a5d5fc4c6c4..2a10805138240fbbfb4120eb94851ede0f0be3dc 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 7d872ed81fee7bedf65fd03e66ce23b99e78745c..0b917bdae60752758d34a33acbed76b9457bb79c 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 9abe76d039ecdb0115be1d52cbb4f0e8c0b11d61..908665d01e6b766d48de93003d8b560781dfe414 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 025231c43daa13a2e0b2d75895c458d3b63cdfe6..715dd9f690ddced14721ef79356a3108899d0972 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 8f1cff4f3e0149bed7661f53c12ba78be4135d5e..97b9fe857799919ecc1f538d8780b2a84c9e37e5 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 d974635e8e7061d6088fd875179a610bbce49149..b7346ea43edb870772018459686951982af782b9 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 b8447ad629e58dc7b056670c291d82a9f95d999b..76b2c9b7c1d83aa23d651173c912780947198c43 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 0105b9cb4ed74818107bf9e02f4a98dc24f7151f..3a026759107bcf4bbeb8691f60edf6f34619307b 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 cca4314341bee2d83da419c16030e969b676ee4d..1b160ffccf030c58a6c9dab6daa7b96128543575 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 cbd52c58699b66914bb08a3c359425b44a9543d5..86fce0349ce78d2720eec8cb7399681838784912 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 13bbd356556f2aa5e2a817876c2b41a6b43bf1db..4c36c918e6de467e6466485de9c4f62c7e0fdb1c 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 6ce1e4bb23348029e1cedf54e1f18cda760d9db5..107ac853714b7863f173e4ecf58ff60ac88341d3 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 dd352af443679bdbaddfb4603ce1d97f9beba443..2cf6745fd34598e6ddfd0546dc66236a153dbd5c 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 bd1e5956f7628ce142d9adc8e6aea514216454b1..61ea9fb85b5a84158888dd546b2e5fd998ce9f8c 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 f56584430c574668a88645aef4edcc2b80027ea5..e7eec32c6ce8b22773732e815b2e94e7ce96e30f 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 5592d7560210250c5d950f90ecf84a94326ade3d..3446e7d449883efeb55ecfacaf7669148a68c42d 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 3d415a4b95ed64e88a4c8e4ab0ae9c40808e49c0..33d9222071d6a170e231de5cc8fc7e42cf2f70dd 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
}