From 3d48e208093d53db8acc5ef1c4859739d4fd5220 Mon Sep 17 00:00:00 2001 From: yggverse Date: Fri, 12 Jul 2024 18:11:34 +0300 Subject: [PATCH] rename deletePage to closePage, remove gtk node on apply --- src/Entity/Browser/Container/Tab.php | 11 ++++++++--- src/Entity/Browser/Menu/Tab/Close.php | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Entity/Browser/Container/Tab.php b/src/Entity/Browser/Container/Tab.php index 48ed1aa5..1a71ae2c 100644 --- a/src/Entity/Browser/Container/Tab.php +++ b/src/Entity/Browser/Container/Tab.php @@ -72,7 +72,7 @@ class Tab ?\GtkWidget $child, int $page_num ) { - $this->deletePage( + $this->closePage( $page_num ); } @@ -152,7 +152,7 @@ class Tab return $this->_page[$page_num]; } - public function deletePage( + public function closePage( int $page_num ): void { @@ -161,10 +161,15 @@ class Tab throw new \Exception; } + // Remove GTK node + $this->gtk->remove_page( + $page_num + ); + // Free memory $this->_page[$page_num] = null; - // Remove internal record + // Cleanup internal record unset( $this->_page[$page_num] ); diff --git a/src/Entity/Browser/Menu/Tab/Close.php b/src/Entity/Browser/Menu/Tab/Close.php index 54cb7762..d2f4fce5 100644 --- a/src/Entity/Browser/Menu/Tab/Close.php +++ b/src/Entity/Browser/Menu/Tab/Close.php @@ -33,7 +33,7 @@ class Close 'activate', function() { - $this->tab->menu->browser->container->tab->gtk->remove_page( + $this->tab->menu->browser->container->tab->closePage( $this->tab->menu->browser->container->tab->gtk->get_current_page() );