Changeset View
Changeset View
Standalone View
Standalone View
applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
Show All 29 Lines | 27 | ColumnLayout { | |||
---|---|---|---|---|---|
30 | width: Layout.minimumWidth | 30 | width: Layout.minimumWidth | ||
31 | height: Layout.minimumHeight | 31 | height: Layout.minimumHeight | ||
32 | Layout.minimumWidth: units.gridUnit * 24 | 32 | Layout.minimumWidth: units.gridUnit * 24 | ||
33 | Layout.minimumHeight: units.gridUnit * 21 | 33 | Layout.minimumHeight: units.gridUnit * 21 | ||
34 | Layout.preferredWidth: Layout.minimumWidth | 34 | Layout.preferredWidth: Layout.minimumWidth | ||
35 | Layout.preferredHeight: Layout.minimumHeight | 35 | Layout.preferredHeight: Layout.minimumHeight | ||
36 | Layout.maximumWidth: Layout.minimumWidth | 36 | Layout.maximumWidth: Layout.minimumWidth | ||
37 | Layout.maximumHeight: Layout.minimumHeight | 37 | Layout.maximumHeight: Layout.minimumHeight | ||
38 | spacing: 0 // avoid gap between title and content | 38 | spacing: toparea.margins.top // compensate -toparea.margins.top of framesvgItem | ||
39 | 39 | | |||
40 | property alias activeApplet: container.activeApplet | 40 | property alias activeApplet: container.activeApplet | ||
41 | property alias hiddenLayout: hiddenItemsView.layout | 41 | property alias hiddenLayout: hiddenItemsView.layout | ||
42 | 42 | | |||
43 | RowLayout { | 43 | RowLayout { | ||
44 | 44 | | |||
45 | PlasmaCore.FrameSvgItem { | ||||
46 | id: toparea | ||||
47 | anchors { | ||||
48 | fill: parent | ||||
mart: not in all places you will have access to a dialog. the magic correct values should come from… | |||||
I've done the first part (the magic correct values should come from the toparea margins). Regarding the control, I'm not sure how it could be done, since the usage of the toparea element changes a lot:
How could that be done? niccolove: I've done the first part (the magic correct values should come from the toparea margins). | |||||
Okay, I tried to create a new component for this on https://phabricator.kde.org/D27695. I did not use toolBar because it was already using a different svg, but if you think that's the best idea, I can investigate that niccolove: Okay, I tried to create a new component for this on https://phabricator.kde.org/D27695. I did… | |||||
49 | leftMargin: -toparea.margins.top | ||||
50 | topMargin: -toparea.margins.top | ||||
51 | rightMargin: -toparea.margins.right | ||||
52 | bottomMargin: -toparea.margins.top | ||||
53 | } | ||||
54 | imagePath: "widgets/toparea" | ||||
55 | } | ||||
56 | | ||||
45 | PlasmaExtras.Heading { | 57 | PlasmaExtras.Heading { | ||
46 | id: heading | 58 | id: heading | ||
47 | Layout.fillWidth: true | 59 | Layout.fillWidth: true | ||
48 | level: 1 | 60 | level: 1 | ||
49 | Layout.leftMargin: { | 61 | Layout.leftMargin: { | ||
50 | //Menu mode | 62 | //Menu mode | ||
51 | if (!activeApplet && hiddenItemsView.visible && !LayoutMirroring.enabled) { | 63 | if (!activeApplet && hiddenItemsView.visible && !LayoutMirroring.enabled) { | ||
52 | return units.smallSpacing; | 64 | return units.smallSpacing; | ||
53 | 65 | | |||
54 | //applet open, sidebar | 66 | //applet open, sidebar | ||
55 | } else if (activeApplet && hiddenItemsView.visible && !LayoutMirroring.enabled) { | 67 | } else if (activeApplet && hiddenItemsView.visible && !LayoutMirroring.enabled) { | ||
56 | return hiddenItemsView.width + units.largeSpacing; | 68 | return hiddenItemsView.width + units.largeSpacing; | ||
57 | 69 | | |||
58 | //applet open, no sidebar | 70 | //applet open, no sidebar | ||
59 | } else { | 71 | } else { | ||
60 | return 0; | 72 | return 0; | ||
ngraham: merge conflict remnant | |||||
61 | } | 73 | } | ||
62 | } | 74 | } | ||
63 | Layout.rightMargin: { | 75 | Layout.rightMargin: { | ||
64 | //Menu mode | 76 | //Menu mode | ||
65 | if (!activeApplet && hiddenItemsView.visible && LayoutMirroring.enabled) { | 77 | if (!activeApplet && hiddenItemsView.visible && LayoutMirroring.enabled) { | ||
66 | return units.smallSpacing; | 78 | return units.smallSpacing; | ||
67 | 79 | | |||
68 | //applet open, sidebar | 80 | //applet open, sidebar | ||
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines |
not in all places you will have access to a dialog. the magic correct values should come from the toparea margins itself done to go well with the correspoding background svg.
in the end, i would like to have this in a control... i kinda hope a standard toolBar control (will need some special casing when that style is running in plasma or an app in plasma mobile