Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Drop support for '--no-minibrowser' mode (#33677)

Browse source 
* Drop support for '--no-minibrowser' mode

Signed-off-by: Taym <haddadi.taym@gmail.com>

* remove unused import

Signed-off-by: Taym <haddadi.taym@gmail.com>

---------

Signed-off-by: Taym <haddadi.taym@gmail.com>
This commit is contained in:
Taym Haddadi 2024-10-07 09:00:32 +01:00 • committed by GitHub
parent 38251fe5e7
commit 6aaca118a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/config/opts.rs
View file

@ -128,9 +128,6 @@ pub struct Opts {
/// Print Progressive Web Metrics to console.
pub print_pwm: bool,
/// True to enable minibrowser
pub minibrowser: bool,
}
fn print_usage(app: &str, opts: &Options) {
@ -425,7 +422,6 @@ pub fn default_opts() -> Opts {
unminify_js: false,
local_script_source: None,
print_pwm: false,
minibrowser: true,
}
}
@ -564,7 +560,6 @@ pub fn from_cmdline_args(mut opts: Options, args: &[String]) -> ArgumentParsingR
"Directory root with unminified scripts",
"",
);
opts.optflag("", "no-minibrowser", "Open minibrowser");
let opt_match = match opts.parse(args) {
Ok(m) => m,
@ -767,7 +762,6 @@ pub fn from_cmdline_args(mut opts: Options, args: &[String]) -> ArgumentParsingR
unminify_js: opt_match.opt_present("unminify-js"),
local_script_source: opt_match.opt_str("local-script-source"),
print_pwm: opt_match.opt_present("print-pwm"),
minibrowser: !opt_match.opt_present("no-minibrowser"),
};
set_options(opts);

2
ports/servoshell/desktop/app.rs
View file

@ -101,7 +101,7 @@ impl App {
minibrowser: None,
};
if opts::get().minibrowser && window.winit_window().is_some() {
if window.winit_window().is_some() {
// Make sure the gl context is made current.
let rendering_context = window.rendering_context();
let webrender_gl = match rendering_context.connection().gl_api() {

24
ports/servoshell/desktop/webview.rs
View file

@ -38,7 +38,6 @@ use tinyfiledialogs::{self, MessageBoxIcon, OkCancel, YesNo};
use super::keyutils::{CMD_OR_ALT, CMD_OR_CONTROL};
use super::window_trait::{WindowPortsMethods, LINE_HEIGHT};
use crate::desktop::tracing::{trace_embedder_event, trace_embedder_msg};
use crate::parser::location_bar_input_to_url;
pub struct WebViewManager<Window: WindowPortsMethods + ?Sized> {
status_text: Option<String>,
@ -431,29 +430,6 @@ where
.shortcut(CMD_OR_CONTROL, 'R', || {
self.focused_webview_id.map(EmbedderEvent::Reload)
})
.shortcut(CMD_OR_CONTROL, 'L', || {
if !opts::get().minibrowser {
let url = match self.focused_webview() {
Some(webview) => webview
.url
.as_ref()
.map(|url| url.to_string())
.unwrap_or_else(String::default),
None => String::default(),
};
let title = "URL or search query";
let input = tinyfiledialogs::input_box(title, title, &tiny_dialog_escape(&url));
input.and_then(|input| {
location_bar_input_to_url(&input).and_then(|url| {
self.focused_webview_id
.map(|id| EmbedderEvent::LoadUrl(id, url))
})
})
} else {
None
}
})
// Select the first 8 tabs via shortcuts
.shortcut(CMD_OR_CONTROL, '1', || self.focus_webview_by_index(0))
.shortcut(CMD_OR_CONTROL, '2', || self.focus_webview_by_index(1))