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.

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

Code Style - #790

Merged
merged 6 commits into from
Sep 16, 2024
Merged

Code Style - #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59ae4e0
TerminalWidget: Use construct clause
jeremypw Sep 15, 2024
5372d01
TerminalView: Only use parameter in creation function
jeremypw Sep 15, 2024
cc843db
ColorPreferenceDialog: Only use parameter in creation function
jeremypw Sep 15, 2024
c4cd7d7
Update TerminalView.vala
danirabbit Sep 15, 2024
953c1b0
Update TerminalWidget.vala
danirabbit Sep 15, 2024
2243f4a
Allow TerminalWidget to change MainWindow
jeremypw Sep 16, 2024
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
5 changes: 3 additions & 2 deletions src/Dialogs/ColorPreferencesDialog.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@ public class Terminal.Dialogs.ColorPreferences : Granite.Dialog {

public ColorPreferences (Gtk.Window? parent) {
Object (
resizable: false,
title: _("Color Preferences"),
transient_for: parent
);
}

construct {
resizable = false;
title = _("Color Preferences");

var window_theme_label = settings_label (_("Window style:"));
window_theme_label.margin_bottom = 12;

Expand Down
11 changes: 6 additions & 5 deletions src/Widgets/TerminalView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,21 @@ public class Terminal.TerminalView : Gtk.Box {

public TerminalView (MainWindow window) {
Object (
main_window: window,
orientation: Gtk.Orientation.VERTICAL,
hexpand: true,
vexpand: true
main_window: window
);
}

construct {
orientation = Gtk.Orientation.VERTICAL;
hexpand = true;
vexpand = true;

var app_instance = (Gtk.Application) GLib.Application.get_default ();

tab_view = new Hdy.TabView () {
hexpand = true,
vexpand = true
};

tab_view.menu_model = create_menu_model ();
tab_view.setup_menu.connect (tab_view_setup_menu);

Expand Down
13 changes: 8 additions & 5 deletions src/Widgets/TerminalWidget.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ namespace Terminal {

GLib.Pid child_pid;

public unowned MainWindow main_window;
public unowned MainWindow main_window { get; construct set; }

private Terminal.Application app {
get {
return main_window.app;
Expand Down Expand Up @@ -154,13 +155,15 @@ namespace Terminal {
public signal void cwd_changed (string cwd);

public TerminalWidget (MainWindow parent_window) {
pointer_autohide = true;
Object (
main_window: parent_window
);
}

construct {
pointer_autohide = true;
terminal_id = "%i".printf (terminal_id_counter++);

init_complete = false;

main_window = parent_window;
child_has_exited = false;
killed = false;

Expand Down