git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#51 wip
[fanfix.git]
/
src
/
jexer
/
TWidget.java
diff --git
a/src/jexer/TWidget.java
b/src/jexer/TWidget.java
index bca2be02f21f03cc305985a56fbf82c5314ae75c..729a5f5d0c3a1b43056087e43c39fae1b7f39527 100644
(file)
--- a/
src/jexer/TWidget.java
+++ b/
src/jexer/TWidget.java
@@
-1115,6
+1115,11
@@
public abstract class TWidget implements Comparable<TWidget> {
assert (window != null);
assert (window != null);
+ if (window instanceof TDesktop) {
+ // Desktop doesn't have a window border.
+ return cursorVisible;
+ }
+
// If cursor is out of my window's bounds, it is not visible.
if ((getCursorAbsoluteX() >= window.getAbsoluteX()
+ window.getWidth() - 1)
// If cursor is out of my window's bounds, it is not visible.
if ((getCursorAbsoluteX() >= window.getAbsoluteX()
+ window.getWidth() - 1)
@@
-1311,6
+1316,10
@@
public abstract class TWidget implements Comparable<TWidget> {
* Called by parent to render to TWindow. Note package private access.
*/
final void drawChildren() {
* Called by parent to render to TWindow. Note package private access.
*/
final void drawChildren() {
+ if (window == null) {
+ return;
+ }
+
// Set my clipping rectangle
assert (window != null);
assert (getScreen() != null);
// Set my clipping rectangle
assert (window != null);
assert (getScreen() != null);
@@
-1327,10
+1336,16
@@
public abstract class TWidget implements Comparable<TWidget> {
int absoluteRightEdge = window.getAbsoluteX() + window.getWidth();
int absoluteBottomEdge = window.getAbsoluteY() + window.getHeight();
int absoluteRightEdge = window.getAbsoluteX() + window.getWidth();
int absoluteBottomEdge = window.getAbsoluteY() + window.getHeight();
- if (!(this instanceof TWindow) && !(this instanceof TVScroller)) {
+ if (!(this instanceof TWindow)
+ && !(this instanceof TVScroller)
+ && !(parent instanceof TDesktop)
+ ) {
absoluteRightEdge -= 1;
}
absoluteRightEdge -= 1;
}
- if (!(this instanceof TWindow) && !(this instanceof THScroller)) {
+ if (!(this instanceof TWindow)
+ && !(this instanceof THScroller)
+ && !(parent instanceof TDesktop)
+ ) {
absoluteBottomEdge -= 1;
}
int myRightEdge = getAbsoluteX() + width;
absoluteBottomEdge -= 1;
}
int myRightEdge = getAbsoluteX() + width;