Fix TrayMenu crash after display wake. Add checks if screen exists, else set scaling to 1.0
TrayMenu: Replace PopupPanel with NPanel (for better loading & to prevent QS crash) Overview, Background etc: add screen checks, if it doesnt exist set scaling to 1.0
This commit is contained in:
parent
714f6c058f
commit
51f1923e22
9 changed files with 119 additions and 137 deletions
|
|
@ -11,7 +11,7 @@ Loader {
|
|||
asynchronous: true
|
||||
|
||||
property ShellScreen screen
|
||||
readonly property real scaling: ScalingService.scale(screen)
|
||||
readonly property real scaling: screen ? ScalingService.scale(screen) : 1.0
|
||||
|
||||
property Component panelContent: null
|
||||
property int panelWidth: 1500
|
||||
|
|
@ -50,6 +50,12 @@ Loader {
|
|||
|
||||
// -----------------------------------------
|
||||
function toggle(aScreen, buttonItem) {
|
||||
// Don't toggle if screen is null or invalid
|
||||
if (!aScreen || !aScreen.name) {
|
||||
Logger.warn("NPanel", "Cannot toggle panel: invalid screen object")
|
||||
return
|
||||
}
|
||||
|
||||
if (!active || isClosing) {
|
||||
open(aScreen, buttonItem)
|
||||
} else {
|
||||
|
|
@ -59,6 +65,12 @@ Loader {
|
|||
|
||||
// -----------------------------------------
|
||||
function open(aScreen, buttonItem) {
|
||||
// Don't open if screen is null or invalid
|
||||
if (!aScreen || !aScreen.name) {
|
||||
Logger.warn("NPanel", "Cannot open panel: invalid screen object")
|
||||
return
|
||||
}
|
||||
|
||||
if (aScreen !== null) {
|
||||
screen = aScreen
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue