From b86565212adc0911227b10fde76bce399138ff90 Mon Sep 17 00:00:00 2001
From: lxsang <xsang.le@gmail.com>
Date: Tue, 14 Jul 2020 23:20:15 +0200
Subject: [PATCH] minor fix on float list

---
 src/core/gui.ts               | 5 ++++-
 src/core/tags/FloatListTag.ts | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/gui.ts b/src/core/gui.ts
index 890f6ee..70718b0 100644
--- a/src/core/gui.ts
+++ b/src/core/gui.ts
@@ -752,11 +752,13 @@ namespace OS {
          * @export
          * @param {string} k the hotkey e.g. `ALT-C`
          * @param {(e: JQuery.MouseDownEvent) => void} f handle function
+         * @param {boolean} force force to rebind the hotkey
          * @returns {void}
          */
         export function bindKey(
             k: string,
-            f: (e: JQuery.MouseDownEvent) => void
+            f: (e: JQuery.MouseDownEvent) => void,
+            force: boolean = true
         ): void {
             const arr = k.split("-");
             if (arr.length !== 2) {
@@ -767,6 +769,7 @@ namespace OS {
             if (!shortcut[fnk]) {
                 return;
             }
+            if (shortcut[fnk][c] && !force) return;
             shortcut[fnk][c] = f;
         }
 
diff --git a/src/core/tags/FloatListTag.ts b/src/core/tags/FloatListTag.ts
index 903bc25..9b40258 100644
--- a/src/core/tags/FloatListTag.ts
+++ b/src/core/tags/FloatListTag.ts
@@ -217,13 +217,13 @@ namespace OS {
                             const h = $(e).height();
                             if (this.dir === "vertical") {
                                 ctop += h + 20;
-                                if (ctop > gh) {
+                                if (ctop + h > gh) {
                                     ctop = 20;
                                     cleft += w + 20;
                                 }
                             } else {
                                 cleft += w + 20;
-                                if (cleft > gw) {
+                                if (cleft + w > gw) {
                                     cleft = 20;
                                     ctop += h + 20;
                                 }