Skip to content

[uicomponents] omit table separators that double the container border #88

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
luapmartin wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −0
Open

[uicomponents] omit table separators that double the container border #88

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
5 changes: 5 additions & 0 deletions framework/uicomponents/qml/Muse/UiComponents/StyledTableView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ Item {
leftMargin: showVerticalHeader ? 8 : index === 0 ? 16 : 8
rightMargin: showVerticalHeader ? 8 : index === tableView.model.columnCount() - 1 ? 16 : 8

// The container border already delimits the right edge; a trailing
// separator on the last column would double up with it — but only
// once the columns fill the viewport width.
showTrailingSeparator: index !== tableView.model.columnCount() - 1 || tableView.contentWidth < tableView.width

title: display.title
preferredWidth: display.preferredWidth
availableFormats: display.availableFormats
Expand Down
8 changes: 8 additions & 0 deletions framework/uicomponents/qml/Muse/UiComponents/internal/StyledTableViewCell.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,10 +567,18 @@ TableViewDelegate {
SeparatorLine {
anchors.bottom: parent.bottom
orientation: Qt.Horizontal
// Drop the underline on the last row only when the rows fill the
// viewport, so its bottom edge coincides with the container border.
// With empty space below, the last row still needs its separator.
visible: root.row !== tableView.rows - 1 || tableView.contentHeight < tableView.height
}
SeparatorLine {
anchors.right: parent.right
orientation: Qt.Vertical
// Likewise, drop the trailing edge on the last column only when the
// columns fill the viewport width (otherwise it delimits the column
// from the empty space to its right).
visible: root.column !== tableView.model.columnCount() - 1 || tableView.contentWidth < tableView.width
}

Component.onCompleted: {
Expand Down
5 changes: 5 additions & 0 deletions framework/uicomponents/qml/Muse/UiComponents/internal/StyledTableViewColumn.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ Item {
property string title: ""
property int preferredWidth: 0

// Hidden for the last column, whose right edge coincides with the
// table's container border (avoids a doubled border line).
property bool showTrailingSeparator: true

property var availableFormats: null

property real leftMargin: 0
Expand Down Expand Up @@ -137,6 +141,7 @@ Item {
SeparatorLine {
anchors.right: parent.right
orientation: Qt.Vertical
visible: root.showTrailingSeparator
}

NavigationFocusBorder {
Expand Down