- [#991](#1163): Workspace right drawer doesn't handle floating corre…

…ctly
edvin · Feb 17, 2020 · 27ba781 · 27ba781
1 parent 382f2ec
commit 27ba781
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,16 @@
 
 ### Additions
 
+## [1.7.21-SNAPSHOT]
+
+### Fixed
+
+- [#991](https://github.com/edvin/tornadofx/issues/1163): Workspace right drawer doesn't handle floating correctly
+
+### Changes
+
+### Additions
+
 ## [1.7.20]
 
 ### Fixed

diff --git a/src/main/java/tornadofx/Drawer.kt b/src/main/java/tornadofx/Drawer.kt
@@ -113,7 +113,7 @@ class Drawer(side: Side, multiselect: Boolean, floatingContent: Boolean) : Borde
                 if (change.wasAdded()) {
                     change.addedSubList.asSequence().mapEach { button }.forEach {
                         configureRotation(it)
-                        buttonArea+= Group(it)
+                        buttonArea += Group(it)
                     }
                 }
                 if (change.wasRemoved()) {
@@ -272,7 +272,10 @@ class Drawer(side: Side, multiselect: Boolean, floatingContent: Boolean) : Borde
         super.layoutChildren()
         if (floatingDrawers && contentArea.children.isNotEmpty()) {
             val buttonBounds = buttonArea.layoutBounds
-            contentArea.resizeRelocate(buttonBounds.maxX, buttonBounds.minY, contentArea.prefWidth(-1.0), buttonBounds.height)
+            when (dockingSide) {
+                Side.RIGHT -> contentArea.resizeRelocate(buttonBounds.minX - contentArea.prefWidth(-1.0), buttonBounds.minY, contentArea.prefWidth(-1.0), buttonBounds.height)
+                else -> contentArea.resizeRelocate(buttonBounds.maxX, buttonBounds.minY, contentArea.prefWidth(-1.0), buttonBounds.height)
+            }
         }
     }
 }