Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement viewport stuffs for window #1718 #6875

Closed
wants to merge 25 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
40ff6cf
viewport
farodin91 Jul 31, 2015
a33ad54
Merge remote-tracking branch 'upstream/master' into window
farodin91 Jul 31, 2015
a9df5f2
[WIP] Implement viewport stuffs for window #1718
farodin91 Jul 31, 2015
43d6d5e
[WIP] Implement viewport stuffs for window #1718
farodin91 Jul 31, 2015
cbaf83b
Merge branch 'window' of github.com:farodin91/servo into window
farodin91 Aug 4, 2015
bb393cd
Merging conflict
farodin91 Aug 4, 2015
4557a5d
Merging conflict 2
farodin91 Aug 4, 2015
d289878
Merge remote-tracking branch 'upstream/master' into window
farodin91 Aug 4, 2015
a5944c7
last Conflict
farodin91 Aug 4, 2015
8d2008e
Merge remote-tracking branch 'upstream/master' into window
farodin91 Aug 5, 2015
6dabb5d
review changes
farodin91 Aug 7, 2015
a800294
Merge remote-tracking branch 'upstream/master' into window
farodin91 Aug 7, 2015
225d2ee
current state
farodin91 Aug 7, 2015
cc7fc18
most changes to the last review
farodin91 Aug 9, 2015
96ae3d4
Merge remote-tracking branch 'upstream/master' into window
farodin91 Aug 9, 2015
9a80339
init support of smooth
farodin91 Aug 9, 2015
c4213b4
Merge remote-tracking branch 'upstream/master' into window
farodin91 Aug 14, 2015
c0e028e
review changes
farodin91 Aug 14, 2015
36d318b
Merging and fix review
farodin91 Aug 16, 2015
10597e2
fix tidy
farodin91 Aug 16, 2015
38f318a
Merge remote-tracking branch 'upstream/master' into window
farodin91 Aug 19, 2015
a9d703a
fixing borrow_mut
farodin91 Aug 19, 2015
3f3b176
Merge remote-tracking branch 'upstream/master' into window
farodin91 Aug 20, 2015
5274eab
Merge remote-tracking branch 'upstream/master' into window
farodin91 Aug 27, 2015
f655800
Merge remote-tracking branch 'upstream/master' into window
farodin91 Sep 1, 2015
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

fix tidy

  • Loading branch information
farodin91 committed Aug 16, 2015
commit 10597e25fea5a21e93b8e7d51bca21faa119ea56
@@ -623,7 +623,7 @@ impl<'a> WindowMethods for &'a Window {
}

// https://drafts.csswg.org/cssom-view/#dom-window-pagexoffset
fn PageXOffset(self) -> i32{
fn PageXOffset(self) -> i32 {
self.ScrollX()
}

@@ -700,7 +700,7 @@ impl<'a> WindowMethods for &'a Window {
fn MoveTo(self, x: i32, y: i32) {
// Step 1
//TODO determine if this operation is allowed
let point = Point2D::new(x,y);
let point = Point2D::new(x, y);
self.compositor.borrow_mut().send(ScriptToCompositorMsg::MoveTo(point)).unwrap()
}

@@ -1041,7 +1041,7 @@ impl<'a> WindowHelpers for &'a Window {
}

fn client_window(self) -> (Size2D<u32>, Point2D<i32>) {
let (send,recv) = ipc::channel::<(Size2D<u32>, Point2D<i32>)>().unwrap();
let (send, recv) = ipc::channel::<(Size2D<u32>, Point2D<i32>)>().unwrap();
self.compositor.borrow_mut().send(ScriptToCompositorMsg::GetClientWindow(send)).unwrap();
recv.recv().unwrap_or((Size2D::zero(), Point2D::zero()))
}
@@ -520,8 +520,8 @@ impl WindowMethods for Window {
fn client_window(&self) -> (Size2D<u32>, Point2D<i32>) {
let (width, height) = self.window.get_outer_size().unwrap();
let size = Size2D::new(width, height);
let (x,y) = self.window.get_position().unwrap();
let origin = Point2D::new(x as i32,y as i32);
let (x, y) = self.window.get_position().unwrap();
let origin = Point2D::new(x as i32, y as i32);
(size, origin)
}

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.