Make location bar text yellow when dirty

servo · Mar 25, 2024 · d9cb2ec · d9cb2ec
1 parent 3fa60d5
commit d9cb2ec
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/ports/servoshell/minibrowser.rs b/ports/servoshell/minibrowser.rs
@@ -7,7 +7,9 @@ use std::num::NonZeroU32;
 use std::sync::Arc;
 use std::time::Instant;
 
-use egui::{CentralPanel, Frame, Key, Modifiers, PaintCallback, Pos2, TopBottomPanel, Vec2};
+use egui::{
+    CentralPanel, Color32, Frame, Key, Modifiers, PaintCallback, Pos2, TopBottomPanel, Vec2,
+};
 use egui_glow::CallbackFn;
 use egui_winit::EventResponse;
 use euclid::{Box2D, Length, Point2D, Scale, Size2D};
@@ -185,11 +187,12 @@ impl Minibrowser {
                 );
             });
 
-            let mut location_dirty = None;
+            let mut location_dirty = false;
             let mut location = location.borrow_mut();
-            if let Some(webview_location) = webviews.focused_webview_mut().map(|w| &w.location) {
-                if webview_location != &*location {
-                    *location = webview_location.clone();
+            if let Some(webview) = webviews.focused_webview_mut() {
+                location_dirty = webview.location_dirty;
+                if webview.location != *location {
+                    *location = webview.location.clone();
                 }
             }
 
@@ -210,16 +213,16 @@ impl Minibrowser {
                             |ui| {
                                 if ui.button("go").clicked() {
                                     event_queue.borrow_mut().push(MinibrowserEvent::Go);
-                                    location_dirty = Some(false);
+                                    location_dirty = false;
                                 }
 
-                                let location_field = ui.add_sized(
-                                    ui.available_size(),
-                                    egui::TextEdit::singleline(&mut *location),
-                                );
+                                let location_field = egui::TextEdit::singleline(&mut *location)
+                                    .text_color_opt(location_dirty.then_some(Color32::YELLOW));
+                                let location_field =
+                                    ui.add_sized(ui.available_size(), location_field);
 
                                 if location_field.changed() {
-                                    location_dirty = Some(true);
+                                    location_dirty = true;
                                 }
                                 if ui.input(|i| i.clone().consume_key(Modifiers::COMMAND, Key::L)) {
                                     location_field.request_focus();
@@ -228,7 +231,7 @@ impl Minibrowser {
                                     ui.input(|i| i.clone().key_pressed(Key::Enter))
                                 {
                                     event_queue.borrow_mut().push(MinibrowserEvent::Go);
-                                    location_dirty = Some(false);
+                                    location_dirty = false;
                                 }
                             },
                         );
@@ -242,9 +245,7 @@ impl Minibrowser {
             *toolbar_height = Length::new(ctx.available_rect().min.y);
 
             if let Some(webview) = webviews.focused_webview_mut() {
-                if let Some(location_dirty) = location_dirty {
-                    webview.location_dirty = location_dirty;
-                }
+                webview.location_dirty = location_dirty;
                 if *location != webview.location {
                     webview.location = location.clone();
                 }