3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-06 10:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

[qt6] Re-enable alternative base and keyboard shortcut to switch to it

Browse source
This commit is contained in:
Candice Bentéjac 2024-10-01 12:35:54 +02:00
parent 9923980041
commit d5cfdb1e85
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meshroom/ui/qml/main.qml
View file

@ -36,8 +36,6 @@ ApplicationWindow {
palette: _PaletteManager.palette palette: _PaletteManager.palette
// TODO: uncomment for Qt6, which correctly supports palette for disabled elements AND an alternate base
/*
// QPalette is not convertible to QML palette (anymore) // QPalette is not convertible to QML palette (anymore)
Component.onCompleted: { Component.onCompleted: {
palette.alternateBase = _PaletteManager.alternateBase palette.alternateBase = _PaletteManager.alternateBase
@ -60,7 +58,7 @@ ApplicationWindow {
palette.disabled.highlightedText = _PaletteManager.disabledHighlightedText palette.disabled.highlightedText = _PaletteManager.disabledHighlightedText
palette.disabled.text = _PaletteManager.disabledText palette.disabled.text = _PaletteManager.disabledText
palette.disabled.windowText = _PaletteManager.disabledWindowText palette.disabled.windowText = _PaletteManager.disabledWindowText
} */ }
SystemPalette { id: activePalette } SystemPalette { id: activePalette }
SystemPalette { id: disabledPalette; colorGroup: SystemPalette.Disabled } SystemPalette { id: disabledPalette; colorGroup: SystemPalette.Disabled }
@ -157,12 +155,11 @@ ApplicationWindow {
} }
// TODO: uncomment for Qt6 to re-enable the alternative palette (the alternative palette and the disabled items currently cannot both be supported) Action {
/* Action {
shortcut: "Ctrl+Shift+P" shortcut: "Ctrl+Shift+P"
onTriggered: _PaletteManager.togglePalette() onTriggered: _PaletteManager.togglePalette()
} */ }
StackView { StackView {
id: mainStack id: mainStack