diff options
| author | Pierre Ossman <ossman@cendio.se> | 2012-09-03 09:45:40 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2012-09-03 09:45:40 +0000 |
| commit | dd138441c40aaa970f17900b7929032154b0ed28 (patch) | |
| tree | ca2626c7a1df0d2b3800337f273440ddaac82b8d /vncviewer/DesktopWindow.cxx | |
| parent | 0e5934631d13510df145a037bee222aae44a139c (diff) | |
| download | tigervnc-dd138441c40aaa970f17900b7929032154b0ed28.tar.gz tigervnc-dd138441c40aaa970f17900b7929032154b0ed28.zip | |
Break some overly long lines.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4993 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'vncviewer/DesktopWindow.cxx')
| -rw-r--r-- | vncviewer/DesktopWindow.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx index 04addba2..fecf6718 100644 --- a/vncviewer/DesktopWindow.cxx +++ b/vncviewer/DesktopWindow.cxx @@ -848,13 +848,19 @@ void DesktopWindow::handleEdgeScroll(void *data) my = self->h(); if ((self->viewport->x() < 0) && (mx < EDGE_SCROLL_SIZE)) - dx = EDGE_SCROLL_SPEED - EDGE_SCROLL_SPEED * mx / EDGE_SCROLL_SIZE; - if ((self->viewport->x() + self->viewport->w() > self->w()) && (mx > self->w() - EDGE_SCROLL_SIZE)) - dx = EDGE_SCROLL_SPEED * (self->w() - mx) / EDGE_SCROLL_SIZE - EDGE_SCROLL_SPEED; + dx = EDGE_SCROLL_SPEED - + EDGE_SCROLL_SPEED * mx / EDGE_SCROLL_SIZE; + if ((self->viewport->x() + self->viewport->w() > self->w()) && + (mx > self->w() - EDGE_SCROLL_SIZE)) + dx = EDGE_SCROLL_SPEED * (self->w() - mx) / EDGE_SCROLL_SIZE - + EDGE_SCROLL_SPEED; if ((self->viewport->y() < 0) && (my < EDGE_SCROLL_SIZE)) - dy = EDGE_SCROLL_SPEED - EDGE_SCROLL_SPEED * my / EDGE_SCROLL_SIZE; - if ((self->viewport->y() + self->viewport->h() > self->h()) && (my > self->h() - EDGE_SCROLL_SIZE)) - dy = EDGE_SCROLL_SPEED * (self->h() - my) / EDGE_SCROLL_SIZE - EDGE_SCROLL_SPEED; + dy = EDGE_SCROLL_SPEED - + EDGE_SCROLL_SPEED * my / EDGE_SCROLL_SIZE; + if ((self->viewport->y() + self->viewport->h() > self->h()) && + (my > self->h() - EDGE_SCROLL_SIZE)) + dy = EDGE_SCROLL_SPEED * (self->h() - my) / EDGE_SCROLL_SIZE - + EDGE_SCROLL_SPEED; if ((dx == 0) && (dy == 0)) return; |