Skip to content
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.

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

Replace width_chars with clamp #798

Merged
merged 6 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/Views/AbstractInstallerView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@ public abstract class AbstractInstallerView : Adw.NavigationPage {

content_area = new Gtk.Box (VERTICAL, 24);

var content_clamp = new Adw.Clamp () {
child = content_area
};

var box = new Gtk.Box (HORIZONTAL, 12) {
homogeneous = true,
hexpand = true,
vexpand = true,
};
box.append (title_area);
box.append (content_area);
box.append (content_clamp);

action_box_end = new Gtk.Box (HORIZONTAL, 6) {
halign = END,
Expand Down
3 changes: 0 additions & 3 deletions src/Views/CheckView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,12 @@ public class Installer.CheckView : AbstractInstallerView {
};

var title_label = new Gtk.Label (title) {
hexpand = true,
max_width_chars = 1,
wrap = true,
xalign = 0
};
title_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);

var description_label = new Gtk.Label (description) {
max_width_chars = 1, // Make Gtk wrap, but not expand the window
use_markup = true,
wrap = true,
xalign = 0
Expand Down
2 changes: 0 additions & 2 deletions src/Views/DiskView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public class Installer.DiskView : AbstractInstallerView {
var install_desc_label = new Gtk.Label (
_("This will erase all data on the selected drive. If you have not backed your data up, you can cancel the installation and use Demo Mode.")
) {
max_width_chars = 45,
wrap = true,
xalign = 0
};
Expand All @@ -70,7 +69,6 @@ public class Installer.DiskView : AbstractInstallerView {
load_spinner.start ();

var load_label = new Gtk.Label (_("Getting the current configuration…")) {
max_width_chars = 45,
wrap = true
};
load_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
Expand Down
1 change: 0 additions & 1 deletion src/Views/DriversView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
var title_label = new Gtk.Label (title);

var description_label = new Gtk.Label (_("Broadcom® Wi-Fi adapters, NVIDIA® graphics, and some virtual machines may not function properly without additional drivers. Most devices do not require additional drivers.")) {
max_width_chars = 1, // Make Gtk wrap, but not expand the window
wrap = true,
xalign = 0
};
Expand Down
7 changes: 1 addition & 6 deletions src/Views/EncryptView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ public class EncryptView : AbstractInstallerView {
var title_label = new Gtk.Label (title);

var details_label = new Gtk.Label (_("Encrypt this device's drive if required for added protection, but be sure you understand:")) {
hexpand = true,
max_width_chars = 1, // Make Gtk wrap, but not expand the window
wrap = true,
xalign = 0
};
Expand Down Expand Up @@ -88,9 +86,7 @@ public class EncryptView : AbstractInstallerView {
var description = new Gtk.Label (
_("If you forget the encryption password, <b>you will not be able to recover data.</b> This is a unique password for this device, not the password for your user account.")
) {
hexpand = true,
margin_bottom = 12,
max_width_chars = 1, // Make Gtk wrap, but not expand the window
use_markup = true,
wrap = true,
xalign = 0
Expand Down Expand Up @@ -278,9 +274,8 @@ public class EncryptView : AbstractInstallerView {

construct {
label_widget = new Gtk.Label (label) {
halign = END,
hexpand = true,
justify = RIGHT,
max_width_chars = 55,
use_markup = true,
wrap = true,
xalign = 1
Expand Down
4 changes: 0 additions & 4 deletions src/Views/ErrorView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public class ErrorView : AbstractInstallerView {

var description_label = new Gtk.Label (_("Installing %s failed, possibly due to a hardware error. The device may not restart properly. You can try the following:").printf (Utils.get_pretty_name ())) {
margin_bottom = 12,
max_width_chars = 1, // Make Gtk wrap, but not expand the window
wrap = true,
xalign = 0
};
Expand All @@ -45,7 +44,6 @@ public class ErrorView : AbstractInstallerView {

var try_label = new Gtk.Label (_("Try the installation again")) {
hexpand = true,
max_width_chars = 1, // Make Gtk wrap, but not expand the window
wrap = true,
xalign = 0
};
Expand All @@ -55,7 +53,6 @@ public class ErrorView : AbstractInstallerView {
};

var launch_label = new Gtk.Label (_("Use Demo Mode and try to manually recover")) {
max_width_chars = 1, // Make Gtk wrap, but not expand the window
wrap = true,
xalign = 0
};
Expand All @@ -65,7 +62,6 @@ public class ErrorView : AbstractInstallerView {
};

var restart_label = new Gtk.Label (_("Restart the device and boot from another drive")) {
max_width_chars = 1, // Make Gtk wrap, but not expand the window
wrap = true,
xalign = 0
};
Expand Down
3 changes: 0 additions & 3 deletions src/Views/SuccessView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,12 @@ public class SuccessView : AbstractInstallerView {
var title_label = new Gtk.Label (title);

var primary_label = new Gtk.Label (_("%s has been installed").printf (Utils.get_pretty_name ())) {
hexpand = true,
max_width_chars = 1,
wrap = true,
xalign = 0
};
primary_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);

secondary_label = new Gtk.Label (null) {
max_width_chars = 1, // Make Gtk wrap, but not expand the window
use_markup = true,
wrap = true,
xalign = 0
Expand Down
1 change: 0 additions & 1 deletion src/Widgets/DecryptMenu.vala
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public class Installer.DecryptMenu: Gtk.Popover {

var secondary_label = new Gtk.Label (_("Enter the partition's encryption password and set a device name for the decrypted partition."));
secondary_label.halign = Gtk.Align.START;
secondary_label.max_width_chars = 50;
secondary_label.selectable = true;
secondary_label.wrap = true;
secondary_label.xalign = 0;
Expand Down
1 change: 0 additions & 1 deletion src/Widgets/DescriptionRow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public class DescriptionRow : Gtk.Box {

var description_label = new Gtk.Label (description) {
hexpand = true,
max_width_chars = 1, // Make Gtk wrap, but not expand the window
use_markup = true,
wrap = true,
xalign = 0
Expand Down
1 change: 0 additions & 1 deletion src/Widgets/InstallTypeGrid.vala
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public class Installer.InstallTypeButton : Gtk.CheckButton {
title_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);

var subtitle_label = new Gtk.Label (subtitle) {
max_width_chars = 1, // Make Gtk wrap, but not expand the window
wrap = true,
xalign = 0
};
Expand Down