QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-15 05:22:53 +08:00
Code Issues Projects Releases Wiki Activity

Fix JSON editor rounded footer

Browse Source
This commit is contained in:
Alex Spataru 2021-11-19 11:37:49 -06:00
parent 8986a3e6d0
commit a74517cb09
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
assets/qml/JsonEditor/Footer.qml
View File

@ -27,7 +27,7 @@ import "../Widgets" as Widgets
Rectangle {
id: root
radius: jsonEditor.radius
color: Cpp_ThemeManager.toolbarGradient2
height: footer.implicitHeight + 4 * app.spacing
//
@ -37,13 +37,29 @@ Rectangle {
signal scrollToBottom()
//
// Background & border
// Radius compensator
//
border.width: 1
border.color: Cpp_ThemeManager.toolbarGradient1
gradient: Gradient {
GradientStop { position: 0; color: Cpp_ThemeManager.toolbarGradient1 }
GradientStop { position: 1; color: Cpp_ThemeManager.toolbarGradient2 }
Rectangle {
color: root.color
height: root.radius
anchors {
top: parent.top
left: parent.left
right: parent.right
}
}
//
// Top border
//
Rectangle {
height: 1
color: Cpp_ThemeManager.toolbarGradient1
anchors {
top: parent.top
left: parent.left
right: parent.right
}
}
//

15
assets/qml/JsonEditor/Header.qml
View File

@ -34,19 +34,10 @@ Rectangle {
//
Rectangle {
id: bg
border.width: 1
anchors.fill: parent
gradient: Gradient {
GradientStop { position: 0; color: Cpp_ThemeManager.toolbarGradient1 }
GradientStop { position: 1; color: Cpp_ThemeManager.toolbarGradient2 }
}
Rectangle {
border.width: 1
anchors.fill: parent
color: "transparent"
border.color: Qt.darker(Cpp_ThemeManager.toolbarGradient2, 1.5)
}
color: Cpp_ThemeManager.toolbarGradient2
border.color: Qt.darker(Cpp_ThemeManager.toolbarGradient2, 1.5)
Rectangle {
height: 1

1
assets/qml/Windows/JsonEditor.qml
View File

@ -123,6 +123,7 @@ FramelessWindow.CustomWindow {
//
Footer {
id: footer
radius: root.radius
onCloseWindow: root.close()
onScrollToBottom: groupEditor.scrollToBottom()