summaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/DefaultSettings.js71
-rw-r--r--src/styles/Floater.qml6
-rw-r--r--src/styles/styles.pro6
3 files changed, 76 insertions, 7 deletions
diff --git a/src/styles/DefaultSettings.js b/src/styles/DefaultSettings.js
index 8936db7..b0563ca 100644
--- a/src/styles/DefaultSettings.js
+++ b/src/styles/DefaultSettings.js
@@ -959,3 +959,74 @@ var detailButton = {
//highlighted: colors.F032L1P,
}
}
+
+var contextMenu = {
+
+ color: colors.B061L4,
+ listItemDividerColor1: colors.B0622L1,
+ listItemDividerColor2: colors.B0622L2,
+ item: {
+ color: {
+ normal: colors.B061L4,
+ pressed: colors.B044,
+ highlighted: colors.B044,
+ },
+ text: {
+ color: {
+ normal: colors.B063L5,
+ pressed: colors.B063L5,
+ highlighted: colors.B063L5,
+ },
+ font: {
+ pixelSize:40
+ }
+ },
+ source: {
+ pressed: images.img_00_more_popup_press
+ },
+ height: 112,
+ iconWidth: 45,
+ iconHeight: 45,
+ spacing: 16
+ },
+ gridItemDividerColor1: colors.B0623L1,
+ gridItemDividerColor2: colors.B0623L2,
+
+ source: images.img_00_popup_bubble_bg,
+ effectSource: images.img_00_popup_bubble_bg_ef,
+
+ arrow: {
+ source: {
+ left: images.img_00_popup_bubble_tail_left,
+ right: images.img_00_popup_bubble_tail_right,
+ top: images.img_00_popup_bubble_tail_top,
+ bottom: images.img_00_popup_bubble_tail_bottom
+ },
+ effectSource: {
+ left: images.img_00_popup_bubble_tail_left_ef,
+ right: images.img_00_popup_bubble_tail_right_ef,
+ top: images.img_00_popup_bubble_tail_top_ef,
+ bottom: images.img_00_popup_bubble_tail_bottom_ef
+ },
+ width: 36,
+ height: 36,
+ anchors: {
+ topMargin: 18,
+ leftMargin: 12,
+ rightMargin:12,
+ bottomMargin:10
+ }
+ },
+ minimumWidth: 386,
+ maximumWidth: 620,
+ listTopMargin: 8,
+ listBottomMargin: 16,
+ listLeftMargin: 10,
+ listRightMargin: 10,
+ screen: {
+ topMargin: 24,
+ bottomMargin: 24,
+ leftMargin: 24,
+ rightMargin: 24
+ }
+}
diff --git a/src/styles/Floater.qml b/src/styles/Floater.qml
index 00a2d86..326bdd2 100644
--- a/src/styles/Floater.qml
+++ b/src/styles/Floater.qml
@@ -4,8 +4,8 @@ Item {
id: floaterBehavior
visible: false
property Component content
- width: contentLoader ? contentLoader.item.width:0
- height: contentLoader ? contentLoader.item.height:0
+ width: contentLoader ? contentLoader.item.implicitWidth:0
+ height: contentLoader ? contentLoader.item.implicitHeight:0
property Item root: findRoot()
function findRoot() {
@@ -19,6 +19,7 @@ Item {
Loader {
id: contentLoader
sourceComponent: content
+ anchors.fill: parent
}
states: State {
@@ -26,5 +27,4 @@ Item {
when: Qt.isQtObject(contentLoader.item) && contentLoader.item.opacity > 0
ParentChange { target: floaterBehavior; parent: root }
}
-
}
diff --git a/src/styles/styles.pro b/src/styles/styles.pro
index 9a05b35..84925a2 100644
--- a/src/styles/styles.pro
+++ b/src/styles/styles.pro
@@ -10,7 +10,8 @@ QML_FILES = \
TabViewStyle.qml \
Floater.qml \
SwitchStyle.qml\
- DetailButtonStyle.qml
+ DetailButtonStyle.qml\
+ DefaultSettings.js
# Images
QML_FILES += \
@@ -19,9 +20,6 @@ QML_FILES += \
images/720x1280/white/*.png \
images/720x1280/white/*.sci
-QML_FILES += \
- DefaultSettings.js
-
CONFIG += force_independent
OTHER_FILES += qmldir