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

servoshell: fix gap between minibrowser toolbar and webview (#31774)

Browse source
This commit is contained in:
Delan Azabani 2024-03-20 19:11:51 +08:00 • committed by GitHub
parent 02a0cdd6fa
commit 94d2f2183a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

90
ports/servoshell/minibrowser.rs
View file

@ -142,53 +142,53 @@ impl Minibrowser {
} = self; } = self;
let widget_fbo = *widget_surface_fbo; let widget_fbo = *widget_surface_fbo;
let _duration = context.run(window, |ctx| { let _duration = context.run(window, |ctx| {
let InnerResponse { inner: height, .. } = TopBottomPanel::top("toolbar").show(ctx, |ui| {
TopBottomPanel::top("toolbar").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.button("back").clicked() { event_queue.borrow_mut().push(MinibrowserEvent::Back);
event_queue.borrow_mut().push(MinibrowserEvent::Back); }
} if ui.button("forward").clicked() {
if ui.button("forward").clicked() { event_queue.borrow_mut().push(MinibrowserEvent::Forward);
event_queue.borrow_mut().push(MinibrowserEvent::Forward); }
} 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() {
if ui.button("go").clicked() { event_queue.borrow_mut().push(MinibrowserEvent::Go);
event_queue.borrow_mut().push(MinibrowserEvent::Go); location_dirty.set(false);
location_dirty.set(false); }
}
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()),
); );
if location_field.changed() { if location_field.changed() {
location_dirty.set(true); location_dirty.set(true);
} }
if ui.input(|i| { if ui.input(|i| i.clone().consume_key(Modifiers::COMMAND, Key::L)) {
i.clone().consume_key(Modifiers::COMMAND, Key::L) location_field.request_focus();
}) { }
location_field.request_focus(); if location_field.lost_focus() &&
} ui.input(|i| i.clone().key_pressed(Key::Enter))
if location_field.lost_focus() && {
ui.input(|i| i.clone().key_pressed(Key::Enter)) event_queue.borrow_mut().push(MinibrowserEvent::Go);
{ location_dirty.set(false);
event_queue.borrow_mut().push(MinibrowserEvent::Go); }
location_dirty.set(false); },
} );
}, },
); );
}, });
);
ui.cursor().min.y // The toolbar height is where the Context’s available rect starts.
}); // For reasons that are unclear, the TopBottomPanel’s ui cursor exceeds this by one egui
*toolbar_height = Length::new(height); // point, but the Context is correct and the TopBottomPanel is wrong.
*toolbar_height = Length::new(ctx.available_rect().min.y);
CentralPanel::default() CentralPanel::default()
.frame(Frame::none()) .frame(Frame::none())