mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-08-15 18:43:59 +00:00
ControlCenter: respect settings for opening position
This commit is contained in:
@@ -44,7 +44,15 @@ NIconButton {
|
|||||||
colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mHover
|
colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mHover
|
||||||
colorBorder: Color.transparent
|
colorBorder: Color.transparent
|
||||||
colorBorderHover: useDistroLogo ? Color.mHover : Color.transparent
|
colorBorderHover: useDistroLogo ? Color.mHover : Color.transparent
|
||||||
onClicked: PanelService.getPanel("controlCenterPanel", screen)?.toggle(this)
|
onClicked: {
|
||||||
|
var controlCenterPanel = PanelService.getPanel("controlCenterPanel", screen)
|
||||||
|
if (Settings.data.controlCenter.position === "close_to_bar_button") {
|
||||||
|
// Willopen the panel next to the bar button.
|
||||||
|
controlCenterPanel.toggle(this)
|
||||||
|
} else {
|
||||||
|
controlCenterPanel.toggle()
|
||||||
|
}
|
||||||
|
}
|
||||||
onRightClicked: PanelService.getPanel("settingsPanel", screen)?.toggle()
|
onRightClicked: PanelService.getPanel("settingsPanel", screen)?.toggle()
|
||||||
|
|
||||||
IconImage {
|
IconImage {
|
||||||
|
|||||||
@@ -135,27 +135,27 @@ ColumnLayout {
|
|||||||
model: [{
|
model: [{
|
||||||
"key": "close_to_bar_button",
|
"key": "close_to_bar_button",
|
||||||
"name": I18n.tr("options.control-center.position.close_to_bar_button")
|
"name": I18n.tr("options.control-center.position.close_to_bar_button")
|
||||||
|
}, {
|
||||||
|
"key": "center",
|
||||||
|
"name": I18n.tr("options.control-center.position.center")
|
||||||
|
}, {
|
||||||
|
"key": "top_center",
|
||||||
|
"name": I18n.tr("options.control-center.position.top_center")
|
||||||
}, {
|
}, {
|
||||||
"key": "top_left",
|
"key": "top_left",
|
||||||
"name": I18n.tr("options.control-center.position.top_left")
|
"name": I18n.tr("options.control-center.position.top_left")
|
||||||
}, {
|
}, {
|
||||||
"key": "top_right",
|
"key": "top_right",
|
||||||
"name": I18n.tr("options.control-center.position.top_right")
|
"name": I18n.tr("options.control-center.position.top_right")
|
||||||
|
}, {
|
||||||
|
"key": "bottom_center",
|
||||||
|
"name": I18n.tr("options.control-center.position.bottom_center")
|
||||||
}, {
|
}, {
|
||||||
"key": "bottom_left",
|
"key": "bottom_left",
|
||||||
"name": I18n.tr("options.control-center.position.bottom_left")
|
"name": I18n.tr("options.control-center.position.bottom_left")
|
||||||
}, {
|
}, {
|
||||||
"key": "bottom_right",
|
"key": "bottom_right",
|
||||||
"name": I18n.tr("options.control-center.position.bottom_right")
|
"name": I18n.tr("options.control-center.position.bottom_right")
|
||||||
}, {
|
|
||||||
"key": "bottom_center",
|
|
||||||
"name": I18n.tr("options.control-center.position.bottom_center")
|
|
||||||
}, {
|
|
||||||
"key": "top_center",
|
|
||||||
"name": I18n.tr("options.control-center.position.top_center")
|
|
||||||
}, {
|
|
||||||
"key": "center",
|
|
||||||
"name": I18n.tr("options.control-center.position.center")
|
|
||||||
}]
|
}]
|
||||||
currentKey: Settings.data.controlCenter.position
|
currentKey: Settings.data.controlCenter.position
|
||||||
onSelected: function (key) {
|
onSelected: function (key) {
|
||||||
|
|||||||
@@ -188,10 +188,14 @@ Item {
|
|||||||
IpcHandler {
|
IpcHandler {
|
||||||
target: "controlCenter"
|
target: "controlCenter"
|
||||||
function toggle() {
|
function toggle() {
|
||||||
// Will attempt to open the panel next to the bar button if any.
|
|
||||||
root.withTargetScreen(screen => {
|
root.withTargetScreen(screen => {
|
||||||
var controlCenterPanel = PanelService.getPanel("controlCenterPanel", screen)
|
var controlCenterPanel = PanelService.getPanel("controlCenterPanel", screen)
|
||||||
controlCenterPanel.toggle(null, "ControlCenter")
|
if (Settings.data.controlCenter.position === "close_to_bar_button") {
|
||||||
|
// Will attempt to open the panel next to the bar button if any.
|
||||||
|
controlCenterPanel.toggle(null, "ControlCenter")
|
||||||
|
} else {
|
||||||
|
controlCenterPanel.toggle()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user