Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10195 - jrasanen:master, r=KiChjang

Browse source 
Added current url to window if no <title> specified.

Fixes issue #9960. Adds current url to window title if title is not specified.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10195)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-28 17:42:54 +05:30
commit 803f39df19
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ports/glutin/window.rs
View file

@ -84,6 +84,7 @@ pub struct Window {
mouse_pos: Cell<Point2D<i32>>, mouse_pos: Cell<Point2D<i32>>,
key_modifiers: Cell<KeyModifiers>, key_modifiers: Cell<KeyModifiers>,
current_url: RefCell<Option<Url>>,
} }
#[cfg(feature = "window")] #[cfg(feature = "window")]
@ -138,6 +139,7 @@ impl Window {
mouse_pos: Cell::new(Point2D::new(0, 0)), mouse_pos: Cell::new(Point2D::new(0, 0)),
key_modifiers: Cell::new(KeyModifiers::empty()), key_modifiers: Cell::new(KeyModifiers::empty()),
current_url: RefCell::new(None),
}; };
gl::clear_color(0.6, 0.6, 0.6, 1.0); gl::clear_color(0.6, 0.6, 0.6, 1.0);
@ -605,15 +607,22 @@ impl WindowMethods for Window {
} }
fn set_page_title(&self, title: Option<String>) { fn set_page_title(&self, title: Option<String>) {
let fallback_title: String = if let Some(ref current_url) = *self.current_url.borrow() {
current_url.to_string()
} else {
String::from("Untitled")
};
let title = match title { let title = match title {
Some(ref title) if title.len() > 0 => &**title, Some(ref title) if title.len() > 0 => &**title,
_ => "untitled", _ => &fallback_title,
}; };
let title = format!("{} - Servo", title); let title = format!("{} - Servo", title);
self.window.set_title(&title); self.window.set_title(&title);
} }
fn set_page_url(&self, _: Url) { fn set_page_url(&self, url: Url) {
*self.current_url.borrow_mut() = Some(url);
} }
fn status(&self, _: Option<String>) { fn status(&self, _: Option<String>) {