Skip to content

Commit cd5baaf

Browse files
authored
Use HeaderLabel size property (#2425)
* CategoryView: use style property of headerlabel size not style * AppInfoView: use HeaderLabel Remove unused label * ReleaseRow: use HeaderLabel and Granite.Box
1 parent 04c3978 commit cd5baaf

4 files changed

Lines changed: 13 additions & 34 deletions

File tree

data/styles/ReleaseRow.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
release {
2-
border-spacing: rem(6px);
32
padding: 1em;
4-
5-
box.header {
6-
border-spacing: rem(6px);
7-
}
83
}

src/Views/AppInfoView.vala

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public class AppCenter.Views.AppInfoView : Adw.NavigationPage {
3333
private GLib.ListStore origin_liststore;
3434
private Gtk.CssProvider accent_provider;
3535
private Gtk.DropDown origin_dropdown;
36-
private Gtk.Label app_subtitle;
3736
private Gtk.Overlay screenshot_overlay;
3837
private Adw.Carousel screenshot_carousel;
3938
private Adw.Clamp screenshot_not_found_clamp;
@@ -140,24 +139,10 @@ public class AppCenter.Views.AppInfoView : Adw.NavigationPage {
140139
package = package
141140
};
142141

143-
var app_title = new Gtk.Label (package.name) {
144-
can_focus = false,
145-
selectable = true,
146-
wrap = true,
147-
xalign = 0
148-
};
149-
app_title.add_css_class (Granite.STYLE_CLASS_H1_LABEL);
150-
151-
app_subtitle = new Gtk.Label (null) {
152-
can_focus = false,
153-
label = package.get_summary (),
154-
selectable = true,
155-
wrap = true,
156-
wrap_mode = Pango.WrapMode.WORD_CHAR,
157-
xalign = 0
142+
var app_title = new Granite.HeaderLabel (package.name) {
143+
secondary_text = package.get_summary (),
144+
size = H1
158145
};
159-
app_subtitle.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
160-
app_subtitle.add_css_class (Granite.CssClass.DIM);
161146

162147
origin_liststore = new GLib.ListStore (typeof (AppCenterCore.Package));
163148

@@ -184,8 +169,7 @@ public class AppCenter.Views.AppInfoView : Adw.NavigationPage {
184169
column_spacing = 12,
185170
valign = Gtk.Align.CENTER
186171
};
187-
header_grid.attach (app_title, 0, 0);
188-
header_grid.attach (app_subtitle, 0, 1, 2);
172+
header_grid.attach (app_title, 0, 0, 1, 2);
189173
header_grid.attach (origin_dropdown, 0, 2, 2);
190174

191175
if (!package.is_local) {

src/Views/CategoryView.vala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,10 @@ public class AppCenter.CategoryView : Adw.NavigationPage {
212212

213213
if (label != null) {
214214
var header = new Granite.HeaderLabel (label) {
215-
margin_start = 12
215+
margin_start = 12,
216+
size = H2
216217
};
217-
header.add_css_class (Granite.STYLE_CLASS_H2_LABEL);
218+
218219
append (header);
219220
}
220221
append (flowbox);

src/Widgets/ReleaseRow.vala

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Authored by: Adam Bieńkowski <donadigos159@gmail.com>
1818
*/
1919

20-
public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
20+
public class AppCenter.Widgets.ReleaseRow : Granite.Box {
2121
public AppStream.Release release { get; construct; }
2222

2323
public ReleaseRow (AppStream.Release release) {
@@ -31,10 +31,9 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
3131
construct {
3232
var header_icon = new Gtk.Image.from_icon_name ("tag-symbolic");
3333

34-
var header_label = new Gtk.Label (format_version (release.get_version ())) {
35-
use_markup = true
34+
var header_label = new Granite.HeaderLabel (format_version (release.get_version ())) {
35+
size = H3
3636
};
37-
header_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
3837

3938
var date_label = new Gtk.Label (format_date (release.get_timestamp ())) {
4039
halign = END,
@@ -50,12 +49,12 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
5049
xalign = 0
5150
};
5251

53-
var header_box = new Gtk.Box (HORIZONTAL, 0);
54-
header_box.add_css_class ("header");
52+
var header_box = new Granite.Box (HORIZONTAL, HALF);
5553
header_box.append (header_icon);
5654
header_box.append (header_label);
5755
header_box.append (date_label);
5856

57+
child_spacing = HALF;
5958
orientation = VERTICAL;
6059
append (header_box);
6160
append (description_label);
@@ -100,7 +99,7 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
10099

101100
private string format_version (string version) {
102101
if (version != null) {
103-
return "<b>%s</b>".printf (version);
102+
return version;
104103
} else {
105104
return _("Unknown version");
106105
}

0 commit comments

Comments
 (0)