Skip to content

added footer component + assorted fixes #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rozyczko wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

added footer component + assorted fixes #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/EasyApp/Gui/Components/SideBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Item {
property alias items: items.contentData

property alias continueButton: continueButton
property Component footerComponent: null

anchors.fill: parent

Expand All @@ -30,9 +31,7 @@ Item {
id: items

anchors.top: tabs.bottom
anchors.bottom: continueButton.visible ?
continueButton.top:
sideBarContainer.bottom
anchors.bottom: footerLoader.top
anchors.left: sideBarContainer.left
anchors.right: sideBarContainer.right

Expand All @@ -45,6 +44,20 @@ Item {
}
// Sidebar content

// Footer content (pinned above continue button)
Loader {
id: footerLoader

active: sideBarContainer.footerComponent !== null
sourceComponent: sideBarContainer.footerComponent

anchors.bottom: continueButton.visible ? continueButton.top : sideBarContainer.bottom
anchors.horizontalCenter: sideBarContainer.horizontalCenter

anchors.bottomMargin: footerLoader.item ? 0.25 * EaStyle.Sizes.fontPixelSize : 0
}
// Footer content

// Continue button
EaElements.SideBarButton {
id: continueButton
Expand All @@ -64,7 +77,7 @@ Item {
// Gradient area above button
Rectangle {
height: 1.25 * EaStyle.Sizes.fontPixelSize
anchors.bottom: continueButton.top
anchors.bottom: footerLoader.top
anchors.left: sideBarContainer.left
anchors.right: sideBarContainer.right

Expand Down
6 changes: 6 additions & 0 deletions src/EasyApp/Gui/Components/TableViewDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ Rectangle {
blocking: false
onHoveredChanged: {
if (hovered) {
// Don't change current index while a text input is being edited,
// as this steals focus from the active editor
var fi = control.Window.activeFocusItem
if (fi && fi.activeFocus && fi.hasOwnProperty('cursorPosition')) {
return
}
//console.error(`${control} [TableViewDelegate.qml] hovered`)
parent.ListView.view.currentIndex = index
}
Expand Down