mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-24 20:18:53 +03:00
Fix theme in cross-signing setup
This commit is contained in:
parent
f145c2a41a
commit
07731f0a2b
6 changed files with 19 additions and 10 deletions
|
@ -24,9 +24,6 @@ Control {
|
||||||
property int rowMargin: 0
|
property int rowMargin: 0
|
||||||
property int rowSpacing: Nheko.paddingSmall
|
property int rowSpacing: Nheko.paddingSmall
|
||||||
|
|
||||||
// Workaround palettes not inheriting for popups
|
|
||||||
palette: timelineRoot.palette
|
|
||||||
|
|
||||||
signal completionClicked(string completion)
|
signal completionClicked(string completion)
|
||||||
signal completionSelected(string id)
|
signal completionSelected(string id)
|
||||||
|
|
||||||
|
@ -76,6 +73,9 @@ Control {
|
||||||
|
|
||||||
bottomPadding: 1
|
bottomPadding: 1
|
||||||
leftPadding: 1
|
leftPadding: 1
|
||||||
|
|
||||||
|
// Workaround palettes not inheriting for popups
|
||||||
|
palette: timelineRoot.palette
|
||||||
rightPadding: 1
|
rightPadding: 1
|
||||||
topPadding: 1
|
topPadding: 1
|
||||||
|
|
||||||
|
|
|
@ -18,15 +18,15 @@ Popup {
|
||||||
|
|
||||||
leftPadding: 10
|
leftPadding: 10
|
||||||
modal: true
|
modal: true
|
||||||
|
|
||||||
|
// Workaround palettes not inheriting for popups
|
||||||
|
palette: timelineRoot.palette
|
||||||
parent: Overlay.overlay
|
parent: Overlay.overlay
|
||||||
rightPadding: 10
|
rightPadding: 10
|
||||||
width: timelineRoot.width * 0.8
|
width: timelineRoot.width * 0.8
|
||||||
x: Math.round(parent.width / 2 - width / 2)
|
x: Math.round(parent.width / 2 - width / 2)
|
||||||
y: Math.round(parent.height / 4)
|
y: Math.round(parent.height / 4)
|
||||||
|
|
||||||
// Workaround palettes not inheriting for popups
|
|
||||||
palette: timelineRoot.palette
|
|
||||||
|
|
||||||
Overlay.modal: Rectangle {
|
Overlay.modal: Rectangle {
|
||||||
color: Qt.rgba(palette.window.r, palette.window.g, palette.window.b, 0.7)
|
color: Qt.rgba(palette.window.r, palette.window.g, palette.window.b, 0.7)
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,8 +163,8 @@ Item {
|
||||||
url: wrapper.url
|
url: wrapper.url
|
||||||
userId: wrapper.userId
|
userId: wrapper.userId
|
||||||
userName: wrapper.userName
|
userName: wrapper.userName
|
||||||
y: section.visible && section.active ? section.y + section.height : 0
|
|
||||||
width: wrapper.width
|
width: wrapper.width
|
||||||
|
y: section.visible && section.active ? section.y + section.height : 0
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
id: scrollHighlight
|
id: scrollHighlight
|
||||||
|
|
|
@ -16,14 +16,14 @@ Popup {
|
||||||
background: null
|
background: null
|
||||||
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
|
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
|
||||||
modal: true
|
modal: true
|
||||||
|
|
||||||
|
// Workaround palettes not inheriting for popups
|
||||||
|
palette: timelineRoot.palette
|
||||||
parent: Overlay.overlay
|
parent: Overlay.overlay
|
||||||
width: Math.min(Math.max(Math.round(parent.width / 2), 450), parent.width) // limiting width to parent.width/2 can be a bit narrow
|
width: Math.min(Math.max(Math.round(parent.width / 2), 450), parent.width) // limiting width to parent.width/2 can be a bit narrow
|
||||||
x: Math.round(parent.width / 2 - contentWidth / 2)
|
x: Math.round(parent.width / 2 - contentWidth / 2)
|
||||||
y: Math.round(parent.height / 4)
|
y: Math.round(parent.height / 4)
|
||||||
|
|
||||||
// Workaround palettes not inheriting for popups
|
|
||||||
palette: timelineRoot.palette
|
|
||||||
|
|
||||||
Overlay.modal: Rectangle {
|
Overlay.modal: Rectangle {
|
||||||
color: "#aa1E1E1E"
|
color: "#aa1E1E1E"
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,9 @@ Item {
|
||||||
height: content.height + implicitFooterHeight + implicitHeaderHeight
|
height: content.height + implicitFooterHeight + implicitHeaderHeight
|
||||||
modal: true
|
modal: true
|
||||||
padding: 0
|
padding: 0
|
||||||
|
|
||||||
|
// Workaround palettes not inheriting for popups
|
||||||
|
palette: timelineRoot.palette
|
||||||
parent: Overlay.overlay
|
parent: Overlay.overlay
|
||||||
standardButtons: Dialog.Ok
|
standardButtons: Dialog.Ok
|
||||||
width: content.width
|
width: content.width
|
||||||
|
@ -78,6 +81,9 @@ Item {
|
||||||
MainWindowDialog {
|
MainWindowDialog {
|
||||||
id: bootstrapCrosssigning
|
id: bootstrapCrosssigning
|
||||||
|
|
||||||
|
// Workaround palettes not inheriting for popups
|
||||||
|
palette: timelineRoot.palette
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
border.color: Nheko.theme.separator
|
border.color: Nheko.theme.separator
|
||||||
border.width: 1
|
border.width: 1
|
||||||
|
@ -202,6 +208,8 @@ Item {
|
||||||
MainWindowDialog {
|
MainWindowDialog {
|
||||||
id: verifyMasterKey
|
id: verifyMasterKey
|
||||||
|
|
||||||
|
// Workaround palettes not inheriting for popups
|
||||||
|
palette: timelineRoot.palette
|
||||||
standardButtons: Dialog.Cancel
|
standardButtons: Dialog.Cancel
|
||||||
|
|
||||||
GridLayout {
|
GridLayout {
|
||||||
|
|
|
@ -37,6 +37,7 @@ Page {
|
||||||
}
|
}
|
||||||
delegate: Pane {
|
delegate: Pane {
|
||||||
id: pane
|
id: pane
|
||||||
|
|
||||||
height: uploadPopup.availableHeight - buttons.height - (scr.visible ? scr.height : 0)
|
height: uploadPopup.availableHeight - buttons.height - (scr.visible ? scr.height : 0)
|
||||||
padding: Nheko.paddingSmall
|
padding: Nheko.paddingSmall
|
||||||
width: uploadPopup.availableHeight - buttons.height
|
width: uploadPopup.availableHeight - buttons.height
|
||||||
|
|
Loading…
Reference in a new issue