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

servoshell: Update all egui dependencies and group them for dependabot (#32683)

Browse source 
This updates egui, making the necessary changes to maintain behavior. In
addition, it groups dependencies so that they are updated in a single PR
by dependabot, avoiding manual work.
This commit is contained in:
Martin Robinson 2024-07-04 08:36:19 +02:00 • committed by GitHub
parent 650af7db92
commit e14e079fff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ports/servoshell/Cargo.toml
View file

@ -93,9 +93,9 @@ ohos-sys = { git = "https://github.com/jschwe/ohos-sys.git" }
# For optional feature servo_allocator/use-system-allocator
servo_allocator = { path = "../../components/allocator" }
arboard = { version = "3" }
egui = { version = "0.26.2" }
egui_glow = { version = "0.26.2", features = ["winit"] }
egui-winit = { version = "0.26.2", default-features = false, features = ["clipboard", "wayland"] }
egui = { version = "0.28.0" }
egui_glow = { version = "0.28.0", features = ["winit"] }
egui-winit = { version = "0.28.0", default-features = false, features = ["clipboard", "wayland"] }
euclid = { workspace = true }
gilrs = "0.10.7"
gleam = { workspace = true }

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

@ -8,7 +8,7 @@ use std::sync::Arc;
use std::time::Instant;
use egui::{
pos2, CentralPanel, Color32, Frame, Key, Modifiers, PaintCallback, Pos2, Spinner,
pos2, CentralPanel, Color32, Frame, Key, Label, Modifiers, PaintCallback, Pos2, Spinner,
TopBottomPanel, Vec2,
};
use egui_glow::CallbackFn;
@ -245,18 +245,6 @@ impl Minibrowser {
};
let mut embedder_events = vec![];
if let Some(status_text) = &self.status_text {
let position = Some(pos2(0.0, ctx.available_rect().max.y));
egui::containers::popup::show_tooltip_at(
ctx,
"tooltip_for_status_text".into(),
position,
|ui| {
ui.label(status_text.clone());
},
);
}
CentralPanel::default()
.frame(Frame::none())
.show(ctx, |ui| {
@ -282,6 +270,17 @@ impl Minibrowser {
let Some(servo_fbo) = servo_framebuffer_id else {
return;
};
if let Some(status_text) = &self.status_text {
egui::containers::popup::show_tooltip_at(
ctx,
ui.layer_id(),
"tooltip layer".into(),
pos2(0.0, ctx.available_rect().max.y),
|ui| ui.add(Label::new(status_text.clone()).extend()),
);
}
ui.painter().add(PaintCallback {
rect,
callback: Arc::new(CallbackFn::new(move |info, painter| {