Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 20:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Redesigned minibrowser toolbar to use icons instead of text (#33179)

Browse source 
* Redesigned minibrowser toolbar to use icons instead of text

Signed-off-by: Benjamin Vincent Schulenburg <bennyschulenburg@gmx.de>

* Apply suggestions from code review

Address a couple nits

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

---------

Signed-off-by: Benjamin Vincent Schulenburg <bennyschulenburg@gmx.de>
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Ben 2024-08-26 11:43:40 +02:00 • committed by GitHub
parent e5caa725da
commit 0e6b55c71d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

55
ports/servoshell/desktop/minibrowser.rs
View file

@ -8,8 +8,8 @@ use std::sync::Arc;
use std::time::Instant; use std::time::Instant;
use egui::{ use egui::{
pos2, CentralPanel, Color32, Frame, Key, Label, Modifiers, PaintCallback, Pos2, Spinner, pos2, CentralPanel, Color32, Frame, Key, Label, Modifiers, PaintCallback, Pos2, TopBottomPanel,
TopBottomPanel, Vec2, Vec2,
}; };
use egui_glow::CallbackFn; use egui_glow::CallbackFn;
use egui_winit::EventResponse; use egui_winit::EventResponse;
@ -58,6 +58,7 @@ pub enum MinibrowserEvent {
Go, Go,
Back, Back,
Forward, Forward,
Reload,
} }
impl Minibrowser { impl Minibrowser {
@ -144,6 +145,13 @@ impl Minibrowser {
position.y < self.toolbar_height.get() position.y < self.toolbar_height.get()
} }
/// Create a frameless button with square sizing, as used in the toolbar.
fn toolbar_button(text: &str) -> egui::Button {
egui::Button::new(text)
.frame(false)
.min_size(Vec2 { x: 20.0, y: 20.0 })
}
/// Update the minibrowser, but don’t paint. /// Update the minibrowser, but don’t paint.
/// If `servo_framebuffer_id` is given, set up a paint callback to blit its contents to our /// If `servo_framebuffer_id` is given, set up a paint callback to blit its contents to our
/// CentralPanel when [`Minibrowser::paint`] is called. /// CentralPanel when [`Minibrowser::paint`] is called.
@ -175,36 +183,39 @@ impl Minibrowser {
// TODO: While in fullscreen add some way to mitigate the increased phishing risk // TODO: While in fullscreen add some way to mitigate the increased phishing risk
// when not displaying the URL bar: https://github.com/servo/servo/issues/32443 // when not displaying the URL bar: https://github.com/servo/servo/issues/32443
if window.fullscreen().is_none() { if window.fullscreen().is_none() {
TopBottomPanel::top("toolbar").show(ctx, |ui| { let frame = egui::Frame::default()
.fill(Color32::from_gray(32))
.inner_margin(4.0);
TopBottomPanel::top("toolbar").frame(frame).show(ctx, |ui| {
ui.allocate_ui_with_layout( ui.allocate_ui_with_layout(
ui.available_size(), ui.available_size(),
egui::Layout::left_to_right(egui::Align::Center), egui::Layout::left_to_right(egui::Align::Center),
|ui| { |ui| {
if ui.button("back").clicked() { if ui.add(Minibrowser::toolbar_button("⏴")).clicked() {
event_queue.borrow_mut().push(MinibrowserEvent::Back); event_queue.borrow_mut().push(MinibrowserEvent::Back);
} }
if ui.button("forward").clicked() { if ui.add(Minibrowser::toolbar_button("⏵")).clicked() {
event_queue.borrow_mut().push(MinibrowserEvent::Forward); event_queue.borrow_mut().push(MinibrowserEvent::Forward);
} }
match self.load_status {
LoadStatus::LoadStart | LoadStatus::HeadParsed => {
if ui.add(Minibrowser::toolbar_button("X")).clicked() {
warn!("Do not support stop yet.");
}
},
LoadStatus::LoadComplete => {
if ui.add(Minibrowser::toolbar_button("↻")).clicked() {
event_queue.borrow_mut().push(MinibrowserEvent::Reload);
}
},
}
ui.add_space(2.0);
ui.allocate_ui_with_layout( ui.allocate_ui_with_layout(
ui.available_size(), ui.available_size(),
egui::Layout::right_to_left(egui::Align::Center), egui::Layout::right_to_left(egui::Align::Center),
|ui| { |ui| {
if ui.button("go").clicked() {
event_queue.borrow_mut().push(MinibrowserEvent::Go);
location_dirty.set(false);
}
match self.load_status {
LoadStatus::LoadStart => {
ui.add(Spinner::new().color(Color32::GRAY));
},
LoadStatus::HeadParsed => {
ui.add(Spinner::new().color(Color32::WHITE));
},
LoadStatus::LoadComplete => { /* No Spinner */ },
}
let location_field = ui.add_sized( let location_field = ui.add_sized(
ui.available_size(), ui.available_size(),
egui::TextEdit::singleline(&mut *location.borrow_mut()), egui::TextEdit::singleline(&mut *location.borrow_mut()),
@ -376,6 +387,10 @@ impl Minibrowser {
TraversalDirection::Forward(1), TraversalDirection::Forward(1),
)); ));
}, },
MinibrowserEvent::Reload => {
let browser_id = browser.webview_id().unwrap();
app_event_queue.push(EmbedderEvent::Reload(browser_id));
},
} }
} }
} }