Skip to content

Fix UI stretching and alignment in Various Artist mode #656

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
RealBrewer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix UI stretching and alignment in Various Artist mode #656

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
28 changes: 21 additions & 7 deletions lib/rubyripper/gtk3/gtkDisc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,29 @@ def setTrackInfoTable()
def setTrackValues
@allTracksButton = Gtk::CheckButton.new(_('All'))
@varArtistLabel = Gtk::Label.new(_('Artist'))
@varArtistLabel.xalign = 0
@tracknameLabel = Gtk::Label.new(_("Track names \(%s track(s)\)") % [@disc.audiotracks])
@tracknameLabel.xalign = 0
@lengthLabel = Gtk::Label.new(_("Length \(%s\)") % [@disc.playtime])

@checkTrackArray = Array.new ; @varArtistEntryArray = Array.new ; @trackEntryArray = Array.new ; @lengthLabelArray = Array.new
(1..@disc.audiotracks).each do |track|
@checkTrackArray << Gtk::CheckButton.new(track.to_s)
@varArtistEntryArray << Gtk::Entry.new()
@trackEntryArray << Gtk::Entry.new()
@lengthLabelArray << Gtk::Label.new(@disc.getLengthText(track))

# Create and configure Artist Entry
artist_entry = Gtk::Entry.new()
artist_entry.xalign = 0
@varArtistEntryArray << artist_entry

# Create and configure Track Entry
track_entry = Gtk::Entry.new()
track_entry.xalign = 0
@trackEntryArray << track_entry

# Create and configure Length Label
length_label = Gtk::Label.new(@disc.getLengthText(track))
length_label.xalign = 1 # Right-align the numbers for a cleaner look
@lengthLabelArray << length_label
end
end

Expand All @@ -227,9 +241,9 @@ def packTrackObjects
Gtk::AttachOptions::SHRINK, 0, 0) #4th column, 1st row

if @md.various?
@trackInfoTable.attach(@varArtistLabel, 1, 2, 0, 1, Gtk::AttachOptions::FILL,
@trackInfoTable.attach(@varArtistLabel, 1, 2, 0, 1, Gtk::AttachOptions::FILL|Gtk::AttachOptions::EXPAND,
Gtk::AttachOptions::SHRINK, 0, 0) #2nd column, 1st row
@trackInfoTable.attach(@tracknameLabel, 2, 3, 0, 1, Gtk::AttachOptions::FILL,
@trackInfoTable.attach(@tracknameLabel, 2, 3, 0, 1, Gtk::AttachOptions::FILL|Gtk::AttachOptions::EXPAND,
Gtk::AttachOptions::SHRINK, 0, 0) #3rd column, 1st row
else
@trackInfoTable.attach(@tracknameLabel, 1, 3, 0, 1, Gtk::AttachOptions::FILL|Gtk::AttachOptions::EXPAND,
Expand All @@ -243,9 +257,9 @@ def packTrackObjects
Gtk::AttachOptions::SHRINK, 0, 0) #4th column, 2nd row till end

if @md.various?
@trackInfoTable.attach(@varArtistEntryArray[index], 1, 2, index + 1, index + 2, Gtk::AttachOptions::FILL,
@trackInfoTable.attach(@varArtistEntryArray[index], 1, 2, index + 1, index + 2, Gtk::AttachOptions::FILL|Gtk::AttachOptions::EXPAND,
Gtk::AttachOptions::SHRINK, 0, 0)
@trackInfoTable.attach(@trackEntryArray[index], 2, 3, index + 1, index + 2, Gtk::AttachOptions::FILL,
@trackInfoTable.attach(@trackEntryArray[index], 2, 3, index + 1, index + 2, Gtk::AttachOptions::FILL|Gtk::AttachOptions::EXPAND,
Gtk::AttachOptions::SHRINK, 0, 0)
else
@trackInfoTable.attach(@trackEntryArray[index],1, 3, 1 + index, 2 + index,
Expand Down