tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tabs: select notes & replies by default

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-05-23 15:50:06 -07:00
parent 6fc5eb27fc
commit 83100d7f50
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -1023,7 +1023,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-tabs" name = "egui-tabs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/damus-io/egui-tabs?rev=ed97a57fc66b3781bc10ab644f9e1ed125d7377a#ed97a57fc66b3781bc10ab644f9e1ed125d7377a" source = "git+https://github.com/damus-io/egui-tabs?rev=75f47141aebcf876986fad00dd83a69a7bb04840#75f47141aebcf876986fad00dd83a69a7bb04840"
dependencies = [ dependencies = [
"egui", "egui",
"egui_extras", "egui_extras",

2
Cargo.toml
View File

@@ -19,7 +19,7 @@ eframe = { version = "0.27.2", default-features = false, features = [ "glow", "w
#eframe = "0.22.0" #eframe = "0.22.0"
egui_extras = { version = "0.27.2", features = ["all_loaders"] } egui_extras = { version = "0.27.2", features = ["all_loaders"] }
ehttp = "0.2.0" ehttp = "0.2.0"
egui-tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "ed97a57fc66b3781bc10ab644f9e1ed125d7377a" } egui-tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "75f47141aebcf876986fad00dd83a69a7bb04840" }
reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls-native-roots" ] } reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls-native-roots" ] }
image = { version = "0.24", features = ["jpeg", "png", "webp"] } image = { version = "0.24", features = ["jpeg", "png", "webp"] }
poll-promise = { version = "0.3.0", features = ["tokio"] } poll-promise = { version = "0.3.0", features = ["tokio"] }

9
src/timeline.rs
View File

@@ -179,6 +179,7 @@ fn tabs_ui(timeline: &mut Timeline, ui: &mut egui::Ui) {
ui.spacing_mut().item_spacing.y = 0.0; ui.spacing_mut().item_spacing.y = 0.0;
let tab_res = egui_tabs::Tabs::new(2) let tab_res = egui_tabs::Tabs::new(2)
.selected(1)
.hover_bg(TabColor::none()) .hover_bg(TabColor::none())
.selected_fg(TabColor::none()) .selected_fg(TabColor::none())
.selected_bg(TabColor::none()) .selected_bg(TabColor::none())
@@ -210,8 +211,13 @@ fn tabs_ui(timeline: &mut Timeline, ui: &mut egui::Ui) {
//ui.add_space(0.5); //ui.add_space(0.5);
ui::hline(ui); ui::hline(ui);
let sel = if let Some(sel) = tab_res.selected() {
sel
} else {
0
};
// fun animation // fun animation
if let Some(sel) = tab_res.selected() {
timeline.selected_view = sel; timeline.selected_view = sel;
let (underline, underline_y) = tab_res.inner()[sel as usize].inner; let (underline, underline_y) = tab_res.inner()[sel as usize].inner;
@@ -240,7 +246,6 @@ fn tabs_ui(timeline: &mut Timeline, ui: &mut egui::Ui) {
let underline = egui::Rangef::new(x, x + w); let underline = egui::Rangef::new(x, x + w);
ui.painter().hline(underline, underline_y, stroke); ui.painter().hline(underline, underline_y, stroke);
}
} }
pub fn timeline_view(ui: &mut egui::Ui, app: &mut Damus, timeline: usize) { pub fn timeline_view(ui: &mut egui::Ui, app: &mut Damus, timeline: usize) {