Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Mobile
Commits
592481da
Commit
592481da
authored
Oct 04, 2019
by
Marco Martin
Browse files
fuse the top panel with krunner
parent
08b1e9a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
containments/homescreen/package/contents/ui/KRunner.qml
View file @
592481da
...
...
@@ -35,6 +35,7 @@ Rectangle {
color
:
listView
.
visible
?
Qt
.
rgba
(
0
,
0
,
0
,
0.8
)
:
"
transparent
"
property
alias
showingResults
:
listView
.
visible
property
int
inputHeight
:
queryField
.
height
+
background
.
fixedMargins
.
top
/
2
+
background
.
fixedMargins
.
bottom
property
int
topPadding
:
0
MouseArea
{
enabled
:
listView
.
visible
...
...
@@ -70,14 +71,14 @@ Rectangle {
}
ColumnLayout
{
height
:
Qt
.
inputMethod
.
keyboardRectangle
.
height
>
0
?
(
Math
.
min
(
implicitHeight
,
background
.
height
,
Qt
.
inputMethod
.
keyboardRectangle
.
y
-
plasmoid
.
availableScreenRect
.
y
))
:
implicitHeight
height
:
Qt
.
inputMethod
.
keyboardRectangle
.
height
>
0
?
(
Math
.
min
(
implicitHeight
,
background
.
height
,
Qt
.
inputMethod
.
keyboardRectangle
.
y
-
plasmoid
.
availableScreenRect
.
y
))
:
implicitHeight
+
anchors
.
topMargin
anchors
{
left
:
parent
.
left
right
:
parent
.
right
top
:
parent
.
top
topMargin
:
background
.
fixedMargins
.
top
/
2
leftMargin
:
background
.
fixedMargins
.
left
/
2
rightMargin
:
background
.
fixedMargins
.
right
/
2
topMargin
:
background
.
fixedMargins
.
top
/
2
+
krunner
.
topPadding
leftMargin
:
background
.
fixedMargins
.
left
rightMargin
:
background
.
fixedMargins
.
right
}
PlasmaComponents.TextField
{
id
:
queryField
...
...
containments/homescreen/package/contents/ui/main.qml
View file @
592481da
...
...
@@ -325,11 +325,11 @@ Item {
id
:
krunner
z
:
998
height
:
plasmoid
.
availableScreenRect
.
height
topPadding
:
plasmoid
.
availableScreenRect
.
y
anchors
{
top
:
parent
.
top
left
:
parent
.
left
right
:
parent
.
right
topMargin
:
plasmoid
.
availableScreenRect
.
y
}
}
}
...
...
containments/panel/package/contents/ui/main.qml
View file @
592481da
...
...
@@ -24,6 +24,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
import
org
.
kde
.
plasma
.
components
2.0
as
PlasmaComponents
import
org
.
kde
.
plasma
.
workspace
.
components
2.0
as
PlasmaWorkspace
import
org
.
kde
.
taskmanager
0.1
as
TaskManager
import
"
LayoutManager.js
"
as
LayoutManager
...
...
@@ -32,14 +33,18 @@ import "quicksettings"
PlasmaCore.ColorScope
{
id
:
root
width
:
480
height
:
64
0
height
:
3
0
//colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
Plasmoid.backgroundHints
:
showingApp
?
PlasmaCore
.
Types
.
StandardBackground
:
PlasmaCore
.
Types
.
NoBackground
property
Item
toolBox
property
int
buttonHeight
:
width
/
4
property
bool
reorderingApps
:
false
property
var
layoutManager
:
LayoutManager
readonly
property
bool
showingApp
:
tasksModel
.
activeTask
&&
tasksModel
.
activeTask
.
valid
&&
!
tasksModel
.
data
(
tasksModel
.
activeTask
,
TaskManager
.
AbstractTasksModel
.
IsFullScreen
)
Containment.onAppletAdded
:
{
addApplet
(
applet
,
x
,
y
);
LayoutManager
.
save
();
...
...
@@ -77,6 +82,16 @@ PlasmaCore.ColorScope {
LayoutManager
.
restore
();
}
TaskManager.TasksModel
{
id
:
tasksModel
sortMode
:
TaskManager
.
TasksModel
.
SortVirtualDesktop
groupMode
:
TaskManager
.
TasksModel
.
GroupDisabled
screenGeometry
:
plasmoid
.
screenGeometry
filterByScreen
:
plasmoid
.
configuration
.
showForCurrentScreenOnly
}
PlasmaCore.DataSource
{
id
:
statusNotifierSource
engine
:
"
statusnotifieritem
"
...
...
@@ -113,7 +128,7 @@ PlasmaCore.ColorScope {
interval
:
60
*
1000
}
Rectangle
{
Item
{
z
:
1
//parent: slidingPanel.visible && !slidingPanel.wideScreen ? panelContents : root
anchors
{
...
...
@@ -122,7 +137,11 @@ PlasmaCore.ColorScope {
bottom
:
parent
.
bottom
}
height
:
root
.
height
color
:
PlasmaCore
.
ColorScope
.
backgroundColor
Rectangle
{
anchors.fill
:
parent
color
:
PlasmaCore
.
ColorScope
.
backgroundColor
opacity
:
showingApp
}
Loader
{
id
:
strengthLoader
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment