aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--homescreen/qml/images/images.qrc5
-rw-r--r--homescreen/qml/images/menubar_background.pngbin69012 -> 70975 bytes
-rw-r--r--homescreen/qml/images/menubar_fullscreen_background.pngbin0 -> 67867 bytes
-rw-r--r--homescreen/qml/images/menubar_fullscreen_mask.png (renamed from homescreen/qml/images/menubar_full_background.png)bin6535 -> 8397 bytes
-rw-r--r--homescreen/qml/images/menubar_normal_background.pngbin68629 -> 0 bytes
-rw-r--r--homescreen/qml/images/menubar_normal_mask.pngbin0 -> 69524 bytes
-rw-r--r--homescreen/qml/main.qml34
-rw-r--r--homescreen/src/homescreenhandler.cpp8
-rw-r--r--homescreen/src/toucharea.cpp4
9 files changed, 31 insertions, 20 deletions
diff --git a/homescreen/qml/images/images.qrc b/homescreen/qml/images/images.qrc
index 0715215..b539f2a 100644
--- a/homescreen/qml/images/images.qrc
+++ b/homescreen/qml/images/images.qrc
@@ -1,8 +1,9 @@
<RCC>
<qresource prefix="/images">
<file>menubar_background.png</file>
- <file>menubar_normal_background.png</file>
- <file>menubar_full_background.png</file>
+ <file>menubar_fullscreen_background.png</file>
+ <file>menubar_normal_mask.png</file>
+ <file>menubar_fullscreen_mask.png</file>
<file>fullscreen.png</file>
<file>normal.png</file>
<file>split_switch.png</file>
diff --git a/homescreen/qml/images/menubar_background.png b/homescreen/qml/images/menubar_background.png
index bb95916..a03a567 100644
--- a/homescreen/qml/images/menubar_background.png
+++ b/homescreen/qml/images/menubar_background.png
Binary files differ
diff --git a/homescreen/qml/images/menubar_fullscreen_background.png b/homescreen/qml/images/menubar_fullscreen_background.png
new file mode 100644
index 0000000..438a871
--- /dev/null
+++ b/homescreen/qml/images/menubar_fullscreen_background.png
Binary files differ
diff --git a/homescreen/qml/images/menubar_full_background.png b/homescreen/qml/images/menubar_fullscreen_mask.png
index 31cbfdb..c6936d2 100644
--- a/homescreen/qml/images/menubar_full_background.png
+++ b/homescreen/qml/images/menubar_fullscreen_mask.png
Binary files differ
diff --git a/homescreen/qml/images/menubar_normal_background.png b/homescreen/qml/images/menubar_normal_background.png
deleted file mode 100644
index 25c9bcf..0000000
--- a/homescreen/qml/images/menubar_normal_background.png
+++ /dev/null
Binary files differ
diff --git a/homescreen/qml/images/menubar_normal_mask.png b/homescreen/qml/images/menubar_normal_mask.png
new file mode 100644
index 0000000..e87d4e2
--- /dev/null
+++ b/homescreen/qml/images/menubar_normal_mask.png
Binary files differ
diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml
index b22ba06..41e1df0 100644
--- a/homescreen/qml/main.qml
+++ b/homescreen/qml/main.qml
@@ -29,16 +29,26 @@ Window {
color: "#00000000"
Image {
+ id: fullscreen_back
+ anchors.centerIn: parent
+ width: 1920
+ height: 1080
+ source: './images/menubar_fullscreen_background.png'
+ }
+
+ Image {
id: container
anchors.centerIn: parent
width: 1920
- height: 720
+ height: 1080
scale: 1.0
source: './images/menubar_background.png'
ColumnLayout {
id: menuBar
- anchors.fill: parent
+ width: 1920
+ height: 720
+// y:180
spacing: 0
TopArea {
id: topArea
@@ -71,38 +81,38 @@ Window {
name: "normal"
PropertyChanges {
target: container
- y: 0
+ y: 180
}
PropertyChanges {
target: topArea
- y: 0
+ y: 180
}
PropertyChanges {
target: applicationArea
- y: 80
+ y: 260
}
PropertyChanges {
target: shortcutArea
- y: 590
+ y: 770
}
},
State {
name: "fullscreen"
PropertyChanges {
target: container
- y: -720
+ y: -900
}
PropertyChanges {
target: topArea
- y: -80
+ y: -260
}
PropertyChanges {
target: applicationArea
- y: -510
+ y: -590
}
PropertyChanges {
target: shortcutArea
- y: 720
+ y: 900
}
}
]
@@ -135,7 +145,7 @@ Window {
anchors.right: parent.right
anchors.rightMargin: 17
anchors.top: parent.top
- anchors.topMargin: 2
+ anchors.topMargin: 182
z: 1
Image {
id: image
@@ -164,7 +174,7 @@ Window {
height: 61
anchors.right: switchBtn.left
anchors.top: parent.top
- anchors.topMargin: 2
+ anchors.topMargin: 182
z: 1
property bool enableSplitSwitchBtn: false
Image {
diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index 7621cf6..c671a1c 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -110,12 +110,12 @@ void HomescreenHandler::changeLayout(int pattern)
std::unordered_map<std::string, Rect> map_list;
switch(pattern) {
case P_LEFT_METER_RIGHT_MAP:
- map_list["split.main"] = Rect(0, 0, 1280, 720);
- map_list["split.sub"] = Rect(1280, 0, 640, 720);
+ map_list["split.main"] = Rect(0, 180, 1280, 720);
+ map_list["split.sub"] = Rect(1280, 180, 640, 720);
break;
case P_LEFT_MAP_RIGHT_METER:
- map_list["split.main"] = Rect(640, 0, 1280, 720);
- map_list["split.sub"] = Rect(0, 0, 640, 720);
+ map_list["split.main"] = Rect(640, 180, 1280, 720);
+ map_list["split.sub"] = Rect(0, 180, 640, 720);
break;
default:
break;
diff --git a/homescreen/src/toucharea.cpp b/homescreen/src/toucharea.cpp
index aad4b1b..a66775f 100644
--- a/homescreen/src/toucharea.cpp
+++ b/homescreen/src/toucharea.cpp
@@ -16,8 +16,8 @@ void TouchArea::setWindow(QQuickWindow *window)
void TouchArea::init()
{
- bitmapNormal = QPixmap(":/images/menubar_normal_background.png").createHeuristicMask();
- bitmapFullscreen = QPixmap(":/images/menubar_full_background.png").createHeuristicMask();
+ bitmapNormal = QPixmap(":/images/menubar_normal_mask.png").createHeuristicMask();
+ bitmapFullscreen = QPixmap(":/images/menubar_fullscreen_mask.png").createHeuristicMask();
myWindow->setMask(QRegion(bitmapNormal));
}