mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-22 15:54:57 +00:00
Code Issues Releases Wiki Activity

Use "scale" cell renderer property to adjust file list font size (#7096)

Browse source 
Manually calculated font size needs to be recalculated (which we weren't
doing), otherwise leading to wrong size on global font size and/or scale
factor changes.

Simplify file list columns setup where possible.
This commit is contained in:
Mike Gelfand 2024-09-03 23:05:11 +01:00 committed by GitHub
parent 461e178c8f
commit 7e60fb87ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gtk/FileList.cc
View file

@ -937,6 +937,8 @@ FileList::Impl::Impl(
, core_(core) , core_(core)
, view_(gtr_get_widget<Gtk::TreeView>(builder, view_name)) , view_(gtr_get_widget<Gtk::TreeView>(builder, view_name))
{ {
static constexpr auto FileAndSizeScale = 0.8;
/* create the view */ /* create the view */
view_->signal_row_activated().connect(sigc::mem_fun(*this, &Impl::onRowActivated)); view_->signal_row_activated().connect(sigc::mem_fun(*this, &Impl::onRowActivated));
setup_item_view_button_event_handling( setup_item_view_button_event_handling(
@ -945,16 +947,6 @@ FileList::Impl::Impl(
{ return onViewButtonPressed(button, state, view_x, view_y); }, { return onViewButtonPressed(button, state, view_x, view_y); },
[this](double view_x, double view_y) { return on_item_view_button_released(*view_, view_x, view_y); }); [this](double view_x, double view_y) { return on_item_view_button_released(*view_, view_x, view_y); });
auto pango_font_description = view_->create_pango_context()->get_font_description();
if (auto const new_size = pango_font_description.get_size() * 0.8; pango_font_description.get_size_is_absolute())
{
pango_font_description.set_absolute_size(new_size);
}
else
{
pango_font_description.set_size(new_size);
}
/* set up view */ /* set up view */
auto const sel = view_->get_selection(); auto const sel = view_->get_selection();
sel->set_mode(TR_GTK_SELECTION_MODE(MULTIPLE)); sel->set_mode(TR_GTK_SELECTION_MODE(MULTIPLE));
@ -979,9 +971,10 @@ FileList::Impl::Impl(
auto* text_rend = Gtk::make_managed<Gtk::CellRendererText>(); auto* text_rend = Gtk::make_managed<Gtk::CellRendererText>();
text_rend->property_editable() = true; text_rend->property_editable() = true;
text_rend->property_ellipsize() = TR_PANGO_ELLIPSIZE_MODE(END); text_rend->property_ellipsize() = TR_PANGO_ELLIPSIZE_MODE(END);
text_rend->property_font_desc() = pango_font_description; text_rend->property_scale() = FileAndSizeScale;
text_rend->signal_edited().connect(sigc::mem_fun(*this, &Impl::cell_edited_callback)); text_rend->signal_edited().connect(sigc::mem_fun(*this, &Impl::cell_edited_callback));
col->pack_start(*text_rend, true); col->pack_start(*text_rend, true);
col->set_spacing(GUI_PAD_SMALL);
col->add_attribute(text_rend->property_text(), file_cols.label); col->add_attribute(text_rend->property_text(), file_cols.label);
col->set_sort_column(file_cols.label); col->set_sort_column(file_cols.label);
view_->append_column(*col); view_->append_column(*col);
@ -991,10 +984,9 @@ FileList::Impl::Impl(
/* add "size" column */ /* add "size" column */
auto* rend = Gtk::make_managed<Gtk::CellRendererText>(); auto* rend = Gtk::make_managed<Gtk::CellRendererText>();
rend->property_alignment() = TR_PANGO_ALIGNMENT(RIGHT); rend->property_alignment() = TR_PANGO_ALIGNMENT(RIGHT);
rend->property_font_desc() = pango_font_description; rend->property_scale() = FileAndSizeScale;
rend->property_xpad() = GUI_PAD; rend->property_xpad() = GUI_PAD;
rend->property_xalign() = 1.0F; rend->property_xalign() = 1.0F;
rend->property_yalign() = 0.5F;
auto* col = Gtk::make_managed<Gtk::TreeViewColumn>(_("Size"), *rend); auto* col = Gtk::make_managed<Gtk::TreeViewColumn>(_("Size"), *rend);
col->set_sizing(TR_GTK_TREE_VIEW_COLUMN_SIZING(GROW_ONLY)); col->set_sizing(TR_GTK_TREE_VIEW_COLUMN_SIZING(GROW_ONLY));
col->set_sort_column(file_cols.size); col->set_sort_column(file_cols.size);
@ -1004,16 +996,10 @@ FileList::Impl::Impl(
{ {
/* add "progress" column */ /* add "progress" column */
auto const* title = _("Have");
int width = 0;
int height = 0;
view_->create_pango_layout(title)->get_pixel_size(width, height);
width += 30; /* room for the sort indicator */
auto* rend = Gtk::make_managed<Gtk::CellRendererProgress>(); auto* rend = Gtk::make_managed<Gtk::CellRendererProgress>();
auto* col = Gtk::make_managed<Gtk::TreeViewColumn>(title, *rend); auto* col = Gtk::make_managed<Gtk::TreeViewColumn>(_("Have"), *rend);
col->add_attribute(rend->property_text(), file_cols.prog_str); col->add_attribute(rend->property_text(), file_cols.prog_str);
col->add_attribute(rend->property_value(), file_cols.prog); col->add_attribute(rend->property_value(), file_cols.prog);
col->set_fixed_width(width);
col->set_sizing(TR_GTK_TREE_VIEW_COLUMN_SIZING(FIXED)); col->set_sizing(TR_GTK_TREE_VIEW_COLUMN_SIZING(FIXED));
col->set_sort_column(file_cols.prog); col->set_sort_column(file_cols.prog);
view_->append_column(*col); view_->append_column(*col);
@ -1021,14 +1007,8 @@ FileList::Impl::Impl(
{ {
/* add "enabled" column */ /* add "enabled" column */
auto const* title = _("Download");
int width = 0;
int height = 0;
view_->create_pango_layout(title)->get_pixel_size(width, height);
width += 30; /* room for the sort indicator */
auto* rend = Gtk::make_managed<Gtk::CellRendererToggle>(); auto* rend = Gtk::make_managed<Gtk::CellRendererToggle>();
auto* col = Gtk::make_managed<Gtk::TreeViewColumn>(title, *rend); auto* col = Gtk::make_managed<Gtk::TreeViewColumn>(_("Download"), *rend);
col->set_fixed_width(width);
col->set_sizing(TR_GTK_TREE_VIEW_COLUMN_SIZING(FIXED)); col->set_sizing(TR_GTK_TREE_VIEW_COLUMN_SIZING(FIXED));
col->set_cell_data_func(*rend, sigc::ptr_fun(&renderDownload)); col->set_cell_data_func(*rend, sigc::ptr_fun(&renderDownload));
col->set_sort_column(file_cols.enabled); col->set_sort_column(file_cols.enabled);
@ -1037,16 +1017,9 @@ FileList::Impl::Impl(
{ {
/* add priority column */ /* add priority column */
auto const* title = _("Priority");
int width = 0;
int height = 0;
view_->create_pango_layout(title)->get_pixel_size(width, height);
width += 30; /* room for the sort indicator */
auto* rend = Gtk::make_managed<Gtk::CellRendererText>(); auto* rend = Gtk::make_managed<Gtk::CellRendererText>();
rend->property_xalign() = 0.5F; rend->property_xalign() = 0.5F;
rend->property_yalign() = 0.5F; auto* col = Gtk::make_managed<Gtk::TreeViewColumn>(_("Priority"), *rend);
auto* col = Gtk::make_managed<Gtk::TreeViewColumn>(title, *rend);
col->set_fixed_width(width);
col->set_sizing(TR_GTK_TREE_VIEW_COLUMN_SIZING(FIXED)); col->set_sizing(TR_GTK_TREE_VIEW_COLUMN_SIZING(FIXED));
col->set_sort_column(file_cols.priority); col->set_sort_column(file_cols.priority);
col->set_cell_data_func(*rend, sigc::ptr_fun(&renderPriority)); col->set_cell_data_func(*rend, sigc::ptr_fun(&renderPriority));