From 3d44bcb754f22db21310542f2d323d0d220b37b9 Mon Sep 17 00:00:00 2001 From: yggverse Date: Mon, 23 Sep 2024 14:02:42 +0300 Subject: [PATCH] rename widget struct entity --- src/browser/mod.rs | 2 +- src/browser/widget.rs | 8 ++++---- src/main.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/browser/mod.rs b/src/browser/mod.rs index 2cfd21a6..8bc6ce7c 100644 --- a/src/browser/mod.rs +++ b/src/browser/mod.rs @@ -40,7 +40,7 @@ impl Browser { ); // Init actions @TODO separated module - widget.gtk().add_action_entries([ + widget.window().add_action_entries([ ActionEntry::builder("debug") .activate(|this: &ApplicationWindow, _, _| { this.emit_enable_debugging(true); diff --git a/src/browser/widget.rs b/src/browser/widget.rs index cd7f2ca2..0910bfc0 100644 --- a/src/browser/widget.rs +++ b/src/browser/widget.rs @@ -1,7 +1,7 @@ use gtk::{Application, ApplicationWindow, Box, HeaderBar}; pub struct Browser { - gtk: ApplicationWindow, + window: ApplicationWindow, } impl Browser { @@ -13,7 +13,7 @@ impl Browser { default_height: i32, ) -> Browser { Self { - gtk: ApplicationWindow::builder() + window: ApplicationWindow::builder() .application(application) .default_width(default_width) .default_height(default_height) @@ -23,7 +23,7 @@ impl Browser { } } - pub fn gtk(&self) -> &ApplicationWindow { - &self.gtk + pub fn window(&self) -> &ApplicationWindow { + &self.window } } diff --git a/src/main.rs b/src/main.rs index 71188821..9e2b3299 100644 --- a/src/main.rs +++ b/src/main.rs @@ -43,7 +43,7 @@ fn main() -> glib::ExitCode { move |this: &Application| { browser::Browser::new(this, db.clone(), 640, 480) .widget() - .gtk() + .window() .present(); } });