Skip to content

Commit dbc56ac

Browse files
committed
mobile: simplify is_mobile
we don't need context anymore Signed-off-by: William Casarin <[email protected]>
1 parent 12a6c64 commit dbc56ac

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

src/app.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ fn process_message(damus: &mut Damus, relay: &str, msg: &RelayMessage) {
413413
}
414414

415415
fn render_damus(damus: &mut Damus, ctx: &Context) {
416-
if is_mobile(ctx) {
416+
if is_mobile() {
417417
render_damus_mobile(ctx, damus);
418418
} else {
419419
render_damus_desktop(ctx, damus);
@@ -557,7 +557,7 @@ fn render_panel(ctx: &egui::Context, app: &mut Damus, timeline_ind: usize) {
557557
ui.visuals_mut().button_frame = false;
558558

559559
if let Some(new_visuals) =
560-
user_requested_visuals_change(is_mobile(ctx), ctx.style().visuals.dark_mode, ui)
560+
user_requested_visuals_change(is_mobile(), ctx.style().visuals.dark_mode, ui)
561561
{
562562
ctx.set_visuals(new_visuals)
563563
}

src/app_creation.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ pub fn setup_cc(cc: &eframe::CreationContext<'_>) {
4848

4949
egui_extras::install_image_loaders(ctx);
5050

51-
ctx.set_visuals(dark_mode(is_mobile(ctx)));
51+
ctx.set_visuals(dark_mode(is_mobile()));
5252

53-
ctx.set_style(if is_mobile(ctx) {
53+
ctx.set_style(if is_mobile() {
5454
create_custom_style(ctx, mobile_font_size)
5555
} else {
5656
create_custom_style(ctx, desktop_font_size)

src/ui/account_login_view.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub struct AccountLoginView<'a> {
1616

1717
impl<'a> View for AccountLoginView<'a> {
1818
fn ui(&mut self, ui: &mut egui::Ui) {
19-
let is_mobile = ui::is_mobile(ui.ctx());
19+
let is_mobile = ui::is_mobile();
2020
if let Some(key) = self.manager.check_for_successful_login() {
2121
// TODO: route to "home"
2222
println!("successful login with key: {:?}", key);

src/ui/account_management.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub struct AccountManagementView<'a> {
1616

1717
impl<'a> View for AccountManagementView<'a> {
1818
fn ui(&mut self, ui: &mut egui::Ui) {
19-
if ui::is_mobile(ui.ctx()) {
19+
if ui::is_mobile() {
2020
self.show_mobile(ui);
2121
} else {
2222
self.show(ui);

src/ui/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ pub fn hline(ui: &egui::Ui) {
4848
}
4949

5050
#[inline]
51-
#[allow(unreachable_code)]
52-
pub fn is_mobile(_ctx: &egui::Context) -> bool {
51+
pub fn is_mobile() -> bool {
5352
#[cfg(feature = "emulate_mobile")]
5453
{
5554
return true;

src/ui/note/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ impl<'a> Note<'a> {
207207
let profile_key = profile.as_ref().unwrap().record().note_key();
208208
let note_key = note_key.as_u64();
209209

210-
if is_mobile(ui.ctx()) {
210+
if is_mobile() {
211211
ui.add(ui::ProfilePic::new(&mut self.app.img_cache, pic));
212212
} else {
213213
let (rect, size) = ui::anim::hover_expand(

0 commit comments

Comments
 (0)