Skip to content

WelcomeView: use HeaderLabel #267

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

Draft
danirabbit wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WelcomeView: use HeaderLabel #267

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
9 changes: 0 additions & 9 deletions data/Application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,13 @@ navigation-view-page > box {
border-spacing: 2em;
}

.header-area {
border-spacing: 0.25em;
}

.header-area image.large-icons {
-gtk-icon-size: 64px;
}

.header-area image.normal-icons {
-gtk-icon-size: 32px;
}

.header-area overlay {
margin-bottom: 0.5em;
}

.content-area {
border-spacing: 1em;
}
Expand Down
47 changes: 27 additions & 20 deletions src/Views/AbstractOnboardingView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,35 @@ public abstract class Onboarding.AbstractOnboardingView : Adw.NavigationPage {
};
overlay.add_overlay (badge);

var title_label = new Gtk.Label (title) {
var header_label = new Granite.HeaderLabel (title) {
halign = CENTER,
justify = CENTER,
wrap = true,
max_width_chars = 50,
use_markup = true
// justify = CENTER,
// max_width_chars = 50,
size = H1,
secondary_text = description
};
title_label.add_css_class (Granite.STYLE_CLASS_H1_LABEL);

var description_label = new Gtk.Label (description) {
halign = CENTER,
justify = CENTER,
wrap = true,
max_width_chars = 50,
use_markup = true
};
description_label.add_css_class (Granite.CssClass.DIM);

var header_area = new Gtk.Box (VERTICAL, 0);
// var title_label = new Gtk.Label (title) {
// halign = CENTER,
// justify = CENTER,
// wrap = true,
// max_width_chars = 50,
// use_markup = true
// };
// title_label.add_css_class (Granite.STYLE_CLASS_H1_LABEL);

// var description_label = new Gtk.Label (description) {
// halign = CENTER,
// justify = CENTER,
// wrap = true,
// max_width_chars = 50,
// use_markup = true
// };
// description_label.add_css_class (Granite.CssClass.DIM);

var header_area = new Granite.Box (VERTICAL, HALF);
header_area.append (overlay);
header_area.append (title_label);
header_area.append (description_label);
header_area.append (header_label);
header_area.add_css_class ("header-area");

custom_bin = new Gtk.Box (VERTICAL, 0) {
Expand Down Expand Up @@ -126,8 +133,8 @@ public abstract class Onboarding.AbstractOnboardingView : Adw.NavigationPage {
{title, description}
);

bind_property ("description", description_label, "label");
bind_property ("title", title_label, "label");
bind_property ("description", header_label, "secondary-text");
bind_property ("title", header_label, "label");

// Grab focus early so we don't interupt the screen reader
showing.connect (() => next_button.grab_focus ());
Expand Down