mirror of
https://github.com/YGGverse/Yoda.git
synced 2025-03-10 12:41:34 +00:00
enable tab append, rename struct members
This commit is contained in:
parent
1293da7955
commit
a1aaebdb7e
@ -96,10 +96,8 @@ impl Tab {
|
||||
// Register dynamically created tab components in the HashMap index
|
||||
self.index.borrow_mut().insert(item.id(), item.clone());
|
||||
|
||||
// Append new Notebook page
|
||||
/* @TODO
|
||||
self.widget
|
||||
.append(item.label(), item.page(), item.is_initially_current()); */
|
||||
// Append new page
|
||||
self.widget.gobject().add_page(item.gobject(), None);
|
||||
|
||||
if page_navigation_request_text.is_none() {
|
||||
item.page_navigation_request_grab_focus(); // @TODO
|
||||
|
@ -192,8 +192,8 @@ impl Item {
|
||||
self.is_initially_current
|
||||
}
|
||||
|
||||
pub fn page(&self) -> &Box {
|
||||
&self.page.widget() // @TODO
|
||||
pub fn gobject(&self) -> &Box {
|
||||
&self.page.gobject()
|
||||
}
|
||||
|
||||
pub fn page_title(&self) -> Option<GString> {
|
||||
|
@ -22,7 +22,7 @@ use std::{cell::RefCell, path::Path, sync::Arc};
|
||||
|
||||
pub struct Page {
|
||||
// GTK
|
||||
widget: Box,
|
||||
gobject: Box,
|
||||
// Actions
|
||||
action_page_open: Arc<SimpleAction>,
|
||||
action_tab_page_navigation_reload: Arc<SimpleAction>,
|
||||
@ -67,15 +67,15 @@ impl Page {
|
||||
));
|
||||
|
||||
// Init widget
|
||||
let widget = Box::builder()
|
||||
let gobject = Box::builder()
|
||||
.orientation(Orientation::Vertical)
|
||||
.name(name)
|
||||
.build();
|
||||
|
||||
widget.append(navigation.widget());
|
||||
widget.append(content.widget());
|
||||
gobject.append(navigation.widget());
|
||||
gobject.append(content.widget());
|
||||
|
||||
widget.insert_action_group("page", Some(&action_group));
|
||||
gobject.insert_action_group("page", Some(&action_group));
|
||||
|
||||
// Init async mutable Meta object
|
||||
let meta = Arc::new(RefCell::new(Meta::new()));
|
||||
@ -104,7 +104,7 @@ impl Page {
|
||||
// Return activated structure
|
||||
Arc::new(Self {
|
||||
// GTK
|
||||
widget,
|
||||
gobject,
|
||||
// Actions
|
||||
action_page_open,
|
||||
action_tab_page_navigation_reload,
|
||||
@ -483,7 +483,7 @@ impl Page {
|
||||
self.meta.borrow().description.clone()
|
||||
}
|
||||
|
||||
pub fn widget(&self) -> &Box {
|
||||
&self.widget
|
||||
pub fn gobject(&self) -> &Box {
|
||||
&self.gobject
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user