git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
a865974
77d3a60
)
Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'
author
Niki Roo
<niki@nikiroo.be>
Thu, 2 Jan 2020 17:20:56 +0000
(18:20 +0100)
committer
Niki Roo
<niki@nikiroo.be>
Thu, 2 Jan 2020 17:20:56 +0000
(18:20 +0100)
1
2
src/jexer/TWidget.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
src/jexer/TWidget.java
index d60efd8d3a321236e2069199c6db2fb364505d69,ce22330576309206861b8246be3423a248499180..ce22330576309206861b8246be3423a248499180
---
1
/
src/jexer/TWidget.java
---
2
/
TWidget.java
+++ b/
src/jexer/TWidget.java
@@@
-1415,6
-1415,7
+1415,7
@@@
public abstract class TWidget implement
* @return TRUE if the child was removed, FALSE if it was not found
*/
public boolean removeChild(final TWidget child) {
+ <<<<<<< HEAD:TWidget.java
if (children.remove(child)) {
child.close();
child.parent = null;
@@@
-1426,6
-1427,19
+1427,19
@@@
}
return false;
+ =======
+ if (children.remove(child)) {
+ child.close();
+ child.parent = null;
+ child.window = null;
+
+ resetTabOrder();
+
+ return true;
+ }
+
+ return false;
+ >>>>>>> upstream-sep2019-tcombo:src/jexer/TWidget.java
}
/**