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

egui: update deprecated calls to use UiBuilder instead

Browse Source
This commit is contained in:
Ken Sedgwick
2024-12-09 10:35:39 -08:00
parent e31ce5d879
commit 66dbbf7c03
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/accounts.rs
View File

@@ -6,7 +6,9 @@ use crate::{
ui::{Preview, PreviewConfig, View}, ui::{Preview, PreviewConfig, View},
Damus, Damus,
}; };
use egui::{Align, Button, Frame, Image, InnerResponse, Layout, RichText, ScrollArea, Ui, Vec2}; use egui::{
Align, Button, Frame, Image, InnerResponse, Layout, RichText, ScrollArea, Ui, UiBuilder, Vec2,
};
use nostrdb::{Ndb, Transaction}; use nostrdb::{Ndb, Transaction};
use super::profile::preview::SimpleProfilePreview; use super::profile::preview::SimpleProfilePreview;
@@ -88,7 +90,7 @@ impl<'a> AccountsView<'a> {
let profile_peview_view = { let profile_peview_view = {
let max_size = egui::vec2(ui.available_width(), 77.0); let max_size = egui::vec2(ui.available_width(), 77.0);
let resp = ui.allocate_response(max_size, egui::Sense::click()); let resp = ui.allocate_response(max_size, egui::Sense::click());
ui.allocate_ui_at_rect(resp.rect, |ui| { ui.allocate_new_ui(UiBuilder::new().max_rect(resp.rect), |ui| {
let preview = let preview =
SimpleProfilePreview::new(profile.as_ref(), img_cache, has_nsec); SimpleProfilePreview::new(profile.as_ref(), img_cache, has_nsec);
show_profile_card(ui, preview, max_size, is_selected, resp) show_profile_card(ui, preview, max_size, is_selected, resp)

9
src/ui/column/header.rs
View File

@@ -11,7 +11,7 @@ use crate::{
}, },
}; };
use egui::{RichText, Stroke}; use egui::{RichText, Stroke, UiBuilder};
use enostr::Pubkey; use enostr::Pubkey;
use nostrdb::{Ndb, Transaction}; use nostrdb::{Ndb, Transaction};
@@ -45,8 +45,11 @@ impl<'a> NavTitle<'a> {
let mut rect = ui.available_rect_before_wrap(); let mut rect = ui.available_rect_before_wrap();
rect.set_height(48.0); rect.set_height(48.0);
let mut child_ui = let mut child_ui = ui.new_child(
ui.child_ui(rect, egui::Layout::left_to_right(egui::Align::Center), None); UiBuilder::new()
.max_rect(rect)
.layout(egui::Layout::left_to_right(egui::Align::Center)),
);
let r = self.title_bar(&mut child_ui); let r = self.title_bar(&mut child_ui);