Skip to content

Align the rename box for tracks #7414

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

Merged
michaelgregorius merged 6 commits into from
Oct 7, 2024
Merged

Align the rename box for tracks #7414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e898df
fix: #7413: Renaming track visual glitch
BaraMGB Aug 1, 2024
d679f2b
revert hide approach / correct alignment and font size
BaraMGB Aug 2, 2024
b2f5f5e
style fixes
BaraMGB Aug 2, 2024
5ee84d8
fix horizontal alignment
BaraMGB Aug 2, 2024
c60b5fe
Consistent font size & positioning
michaelgregorius Oct 7, 2024
2278f7a
Streamline default style sheet
michaelgregorius Oct 7, 2024
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
11 changes: 0 additions & 11 deletions data/themes/default/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,35 +601,24 @@ lmms--gui--TrackLabelButton:hover {
background: #3B424A;
border: 1px solid #515B66;
border-radius: none;
font-size: 11px;
font-weight: normal;
padding: 2px 1px;
}

lmms--gui--TrackLabelButton:pressed {
background: #262B30;
border-radius: none;
font-size: 11px;
font-weight: normal;
padding: 2px 1px;
}

lmms--gui--TrackLabelButton:checked {
border: 1px solid #485059;
background: #1C1F24;
background-image: url("resources:track_shadow_p.png");
border-radius: none;
font-size: 11px;
font-weight: normal;
padding: 2px 1px;
}

lmms--gui--TrackLabelButton:checked:pressed {
border: 1px solid #2f353b;
background: #0e1012;
background-image: url("resources:track_shadow_p.png");
font-size: 11px;
padding: 2px 1px;
font-weight: solid;
}

Expand Down
20 changes: 15 additions & 5 deletions src/gui/tracks/TrackLabelButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ TrackLabelButton::TrackLabelButton( TrackView * _tv, QWidget * _parent ) :
setAcceptDrops( true );
setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
setToolButtonStyle( Qt::ToolButtonTextBesideIcon );

m_renameLineEdit = new TrackRenameLineEdit( this );
m_renameLineEdit->hide();

Expand All @@ -60,8 +61,6 @@ TrackLabelButton::TrackLabelButton( TrackView * _tv, QWidget * _parent ) :
else
{
setFixedSize( 160, 29 );
m_renameLineEdit->move( 30, ( height() / 2 ) - ( m_renameLineEdit->sizeHint().height() / 2 ) );
m_renameLineEdit->setFixedWidth( width() - 33 );
connect( m_renameLineEdit, SIGNAL(editingFinished()), this, SLOT(renameFinished()));
}

Expand Down Expand Up @@ -89,11 +88,22 @@ void TrackLabelButton::rename()
}
else
{
QString txt = m_trackView->getTrack()->name();
m_renameLineEdit->show();
m_renameLineEdit->setText( txt );
const auto & trackName = m_trackView->getTrack()->name();
m_renameLineEdit->setText(trackName);
m_renameLineEdit->selectAll();
m_renameLineEdit->setFocus();

// Make sure that the rename line edit uses the same font as the widget
// which is set via style sheets
m_renameLineEdit->setFont(font());

// Move the line edit to the correct position by taking the size of the
// icon into account.
const auto iconWidth = iconSize().width();
m_renameLineEdit->move(iconWidth + 1, (height() / 2 - m_renameLineEdit->sizeHint().height() / 2) + 1);
m_renameLineEdit->setFixedWidth(width() - (iconWidth + 6));

m_renameLineEdit->show();
}
}

Expand Down