YGGverse
/
Yoda
mirror of https://github.com/YGGverse/Yoda.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

use shared current widget id getter

master
yggverse 2 months ago
parent
572d5af387
commit
77e3c8aec3
2 changed files with 58 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      src/app/browser/window/tab.rs
  2. 26
      src/app/browser/window/tab/widget.rs

118
src/app/browser/window/tab.rs
Unescape View File

@ -137,104 +137,65 @@ impl Tab { @@ -137,104 +137,65 @@ impl Tab {
// Close active tab
pub fn close(&self) {
self.widget
.gobject()
.remove_page(self.widget.gobject().current_page());
self.widget.close();
}
// Close all tabs
pub fn close_all(&self) {
// @TODO skip pinned or make confirmation alert (GTK>=4.10)
while let Some(page_number) = self.widget.gobject().current_page() {
self.widget.gobject().remove_page(Some(page_number));
}
self.widget.close_all();
}
// Toggle pin status for active tab
pub fn pin(&self) {
// Get current page
if let Some(page_number) = self.widget.gobject().current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.gobject().nth_page(Some(page_number)) {
// Get label by ID
if let Some(label) = self.labels.borrow().get(&widget.widget_name()) {
label.pin(!label.is_pinned()); // toggle
}
if let Some(id) = self.widget.current_name() {
if let Some(label) = self.labels.borrow().get(&id) {
label.pin(!label.is_pinned()); // toggle
}
}
}
pub fn page_navigation_base(&self) {
// Get current page
if let Some(page_number) = self.widget.gobject().current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.gobject().nth_page(Some(page_number)) {
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(&widget.widget_name()) {
page.navigation_base();
}
if let Some(id) = self.widget.current_name() {
if let Some(page) = self.pages.borrow().get(&id) {
page.navigation_base();
}
}
}
pub fn page_navigation_history_back(&self) {
// Get current page
if let Some(page_number) = self.widget.gobject().current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.gobject().nth_page(Some(page_number)) {
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(&widget.widget_name()) {
page.navigation_history_back();
}
if let Some(id) = self.widget.current_name() {
if let Some(page) = self.pages.borrow().get(&id) {
page.navigation_history_back();
}
}
}
pub fn page_navigation_history_forward(&self) {
// Get current page
if let Some(page_number) = self.widget.gobject().current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.gobject().nth_page(Some(page_number)) {
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(&widget.widget_name()) {
page.navigation_history_forward();
}
if let Some(id) = self.widget.current_name() {
if let Some(page) = self.pages.borrow().get(&id) {
page.navigation_history_forward();
}
}
}
pub fn page_navigation_reload(&self) {
// Get current page
if let Some(page_number) = self.widget.gobject().current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.gobject().nth_page(Some(page_number)) {
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(&widget.widget_name()) {
page.navigation_reload();
}
if let Some(id) = self.widget.current_name() {
if let Some(page) = self.pages.borrow().get(&id) {
page.navigation_reload();
}
}
}
pub fn update(&self) {
// Get current page
if let Some(page_number) = self.widget.gobject().current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.gobject().nth_page(Some(page_number)) {
// Get widget ID
let id = &widget.widget_name();
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(id) {
page.update();
// Get label by widget ID
if let Some(label) = self.labels.borrow().get(id) {
if let Some(title) = page.title() {
label.update(Some(&title));
} else {
label.update(None);
}
if let Some(id) = self.widget.current_name() {
if let Some(page) = self.pages.borrow().get(&id) {
page.update();
if let Some(label) = self.labels.borrow().get(&id) {
if let Some(title) = page.title() {
label.update(Some(&title));
} else {
label.update(None);
}
}
}
@ -243,16 +204,9 @@ impl Tab { @@ -243,16 +204,9 @@ impl Tab {
// Getters
pub fn page_title(&self) -> Option<GString> {
// Get current page
if let Some(page_number) = self.widget.gobject().current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.gobject().nth_page(Some(page_number)) {
// Get widget ID
let id = &widget.widget_name();
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(id) {
return page.title();
}
if let Some(id) = self.widget.current_name() {
if let Some(page) = self.pages.borrow().get(&id) {
return page.title();
}
}
@ -260,16 +214,10 @@ impl Tab { @@ -260,16 +214,10 @@ impl Tab {
}
pub fn page_description(&self) -> Option<GString> {
// Get current page
if let Some(page_number) = self.widget.gobject().current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.gobject().nth_page(Some(page_number)) {
// Get widget ID
let id = &widget.widget_name();
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(id) {
return page.description();
}
if let Some(id) = self.widget.current_name() {
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(&id) {
return page.description();
}
}

26
src/app/browser/window/tab/widget.rs
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
use gtk::Notebook;
use gtk::{glib::GString, prelude::WidgetExt, Notebook};
pub struct Widget {
gobject: Notebook,
@ -12,7 +12,31 @@ impl Widget { @@ -12,7 +12,31 @@ impl Widget {
Self { gobject }
}
// Actions
pub fn close(&self) {
self.gobject.remove_page(self.gobject().current_page());
}
pub fn close_all(&self) {
// @TODO skip pinned or make confirmation alert (GTK>=4.10)
while let Some(page_number) = self.gobject.current_page() {
self.gobject.remove_page(Some(page_number));
}
}
// Getters
pub fn current_name(&self) -> Option<GString> {
let page_number = self.gobject.current_page()?;
let nth_page = self.gobject.nth_page(Some(page_number))?;
let widget_name = nth_page.widget_name();
if !widget_name.is_empty() {
Some(widget_name)
} else {
None
}
}
pub fn gobject(&self) -> &Notebook {
&self.gobject
}

Write Preview
Loading…
Cancel
Save