diff options
author | markt <markt> | 2007-02-28 21:29:58 (GMT) |
---|---|---|
committer | markt <markt> | 2007-02-28 21:29:58 (GMT) |
commit | a0944a02cd46d30abd445569f2e5ffa46d113a0c (patch) | |
tree | ded83e8534c0c759c8757c14aaa252934102941f | |
parent | ec9cd21ddaf53b836e9a92d5c329feb18f12ba22 (diff) | |
download | fluxbox_lack-a0944a02cd46d30abd445569f2e5ffa46d113a0c.zip fluxbox_lack-a0944a02cd46d30abd445569f2e5ffa46d113a0c.tar.bz2 |
ignore borders when doing FocusLeft, etc.
-rw-r--r-- | src/FbTk/ITypeAheadable.hh | 0 | ||||
-rw-r--r-- | src/FbTk/SearchResult.cc | 0 | ||||
-rw-r--r-- | src/FbTk/SearchResult.hh | 0 | ||||
-rw-r--r-- | src/FbTk/TypeAhead.hh | 0 | ||||
-rw-r--r-- | src/FocusControl.cc | 16 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/FbTk/ITypeAheadable.hh b/src/FbTk/ITypeAheadable.hh new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/FbTk/ITypeAheadable.hh | |||
diff --git a/src/FbTk/SearchResult.cc b/src/FbTk/SearchResult.cc new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/FbTk/SearchResult.cc | |||
diff --git a/src/FbTk/SearchResult.hh b/src/FbTk/SearchResult.hh new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/FbTk/SearchResult.hh | |||
diff --git a/src/FbTk/TypeAhead.hh b/src/FbTk/TypeAhead.hh new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/FbTk/TypeAhead.hh | |||
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 15fa0fc..5cbf645 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
@@ -275,10 +275,10 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { | |||
275 | FluxboxWindow *foundwin = 0; | 275 | FluxboxWindow *foundwin = 0; |
276 | int weight = 999999, exposure = 0; // extreme values | 276 | int weight = 999999, exposure = 0; // extreme values |
277 | int borderW = m_screen.winFrameTheme().border().width(), | 277 | int borderW = m_screen.winFrameTheme().border().width(), |
278 | top = win.y(), | 278 | top = win.y() + borderW, |
279 | bottom = win.y() + win.height() + 2*borderW, | 279 | bottom = win.y() + win.height() + borderW, |
280 | left = win.x(), | 280 | left = win.x() + borderW, |
281 | right = win.x() + win.width() + 2*borderW; | 281 | right = win.x() + win.width() + borderW; |
282 | 282 | ||
283 | Workspace::Windows &wins = m_screen.currentWorkspace()->windowList(); | 283 | Workspace::Windows &wins = m_screen.currentWorkspace()->windowList(); |
284 | Workspace::Windows::iterator it = wins.begin(); | 284 | Workspace::Windows::iterator it = wins.begin(); |
@@ -292,12 +292,12 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { | |||
292 | // we check things against an edge, and within the bounds (draw a picture) | 292 | // we check things against an edge, and within the bounds (draw a picture) |
293 | int edge=0, upper=0, lower=0, oedge=0, oupper=0, olower=0; | 293 | int edge=0, upper=0, lower=0, oedge=0, oupper=0, olower=0; |
294 | 294 | ||
295 | int otop = (*it)->y(), | 295 | int otop = (*it)->y() + borderW, |
296 | // 2 * border = border on each side | 296 | // 2 * border = border on each side |
297 | obottom = (*it)->y() + (*it)->height() + 2*borderW, | 297 | obottom = (*it)->y() + (*it)->height() + borderW, |
298 | oleft = (*it)->x(), | 298 | oleft = (*it)->x() + borderW, |
299 | // 2 * border = border on each side | 299 | // 2 * border = border on each side |
300 | oright = (*it)->x() + (*it)->width() + 2*borderW; | 300 | oright = (*it)->x() + (*it)->width() + borderW; |
301 | 301 | ||
302 | // check if they intersect | 302 | // check if they intersect |
303 | switch (dir) { | 303 | switch (dir) { |