From 1d369afc80374f7de6926da01dfe17f053e831b9 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Sat, 10 Feb 2024 17:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86UI=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/lunadeer/dominion/tuis/DominionFlagInfo.java | 2 +-
 .../java/cn/lunadeer/dominion/tuis/DominionPrivilegeList.java | 2 +-
 src/main/java/cn/lunadeer/dominion/tuis/ListDominion.java     | 2 +-
 src/main/java/cn/lunadeer/dominion/tuis/PrivilegeInfo.java    | 2 +-
 src/main/java/cn/lunadeer/dominion/utils/STUI/ListView.java   | 3 +++
 src/main/java/cn/lunadeer/dominion/utils/STUI/Pagination.java | 4 ++++
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cn/lunadeer/dominion/tuis/DominionFlagInfo.java b/src/main/java/cn/lunadeer/dominion/tuis/DominionFlagInfo.java
index 2b856a4..55994ac 100644
--- a/src/main/java/cn/lunadeer/dominion/tuis/DominionFlagInfo.java
+++ b/src/main/java/cn/lunadeer/dominion/tuis/DominionFlagInfo.java
@@ -31,7 +31,7 @@ public class DominionFlagInfo {
             } catch (Exception ignored) {
             }
         }
-        ListView view = ListView.create(6, "/dominion flag_info " + dominion.getName());
+        ListView view = ListView.create(10, "/dominion flag_info " + dominion.getName());
         view.title("领地 " + dominion.getName() + " 默认权限")
                 .navigator(Line.create()
                         .append(Button.create("主菜单", "/dominion menu"))
diff --git a/src/main/java/cn/lunadeer/dominion/tuis/DominionPrivilegeList.java b/src/main/java/cn/lunadeer/dominion/tuis/DominionPrivilegeList.java
index bac391b..a011b60 100644
--- a/src/main/java/cn/lunadeer/dominion/tuis/DominionPrivilegeList.java
+++ b/src/main/java/cn/lunadeer/dominion/tuis/DominionPrivilegeList.java
@@ -33,7 +33,7 @@ public class DominionPrivilegeList {
             Notification.error(sender, "你不在任何领地内，请指定领地名称 /dominion privilege_list <领地名称>");
             return;
         }
-        ListView view = ListView.create(5, "/dominion privilege_list " + dominion.getName());
+        ListView view = ListView.create(10, "/dominion privilege_list " + dominion.getName());
         if (noAuthToManage(player, dominion)) return;
         List<PlayerPrivilegeDTO> privileges = PlayerPrivilegeDTO.select(dominion.getId());
         if (privileges.isEmpty()) {
diff --git a/src/main/java/cn/lunadeer/dominion/tuis/ListDominion.java b/src/main/java/cn/lunadeer/dominion/tuis/ListDominion.java
index 9ba3430..ed6d48b 100644
--- a/src/main/java/cn/lunadeer/dominion/tuis/ListDominion.java
+++ b/src/main/java/cn/lunadeer/dominion/tuis/ListDominion.java
@@ -19,7 +19,7 @@ public class ListDominion {
         Player player = playerOnly(sender);
         if (player == null) return;
         int page = getPage(args);
-        ListView view = ListView.create(5, "/dominion list");
+        ListView view = ListView.create(10, "/dominion list");
         List<String> dominions = playerDominions(sender);
         if (dominions.isEmpty()) {
             Notification.warn(sender, "你没有任何领地");
diff --git a/src/main/java/cn/lunadeer/dominion/tuis/PrivilegeInfo.java b/src/main/java/cn/lunadeer/dominion/tuis/PrivilegeInfo.java
index d004650..1bb415c 100644
--- a/src/main/java/cn/lunadeer/dominion/tuis/PrivilegeInfo.java
+++ b/src/main/java/cn/lunadeer/dominion/tuis/PrivilegeInfo.java
@@ -32,7 +32,7 @@ public class PrivilegeInfo {
             Notification.error(sender, "你不在任何领地内，请指定领地名称 /dominion privilege_info <玩家名称> [领地名称]");
             return;
         }
-        ListView view = ListView.create(5, "/dominion privilege_info " + playerName + " " + dominion.getName());
+        ListView view = ListView.create(10, "/dominion privilege_info " + playerName + " " + dominion.getName());
         if (noAuthToManage(player, dominion)) return;
         PlayerDTO playerDTO = PlayerDTO.select(playerName);
         if (playerDTO == null) {
diff --git a/src/main/java/cn/lunadeer/dominion/utils/STUI/ListView.java b/src/main/java/cn/lunadeer/dominion/utils/STUI/ListView.java
index 03590be..e19fa40 100644
--- a/src/main/java/cn/lunadeer/dominion/utils/STUI/ListView.java
+++ b/src/main/java/cn/lunadeer/dominion/utils/STUI/ListView.java
@@ -73,6 +73,9 @@ public class ListView {
         }
         for (int i = offset; i < offset + page_size; i++) {
             if (i >= lines.size()) {
+                for (int j = 0; j < page_size - lines.size() % page_size; j++) {
+                    view.addLine(Line.create());
+                }
                 break;
             }
             view.addLine(lines.get(i));
diff --git a/src/main/java/cn/lunadeer/dominion/utils/STUI/Pagination.java b/src/main/java/cn/lunadeer/dominion/utils/STUI/Pagination.java
index d7f737a..aa9a72d 100644
--- a/src/main/java/cn/lunadeer/dominion/utils/STUI/Pagination.java
+++ b/src/main/java/cn/lunadeer/dominion/utils/STUI/Pagination.java
@@ -25,9 +25,13 @@ public class Pagination {
         componentList.add(Component.text(" 页 ", main_color));
         if (page > 1) {
             componentList.add(Button.create("上一页", command + " " + (page - 1)));
+        } else {
+            componentList.add(Component.text("[上一页]", sub_color));
         }
         if (page < page_count) {
             componentList.add(Button.create("下一页", command + " " + (page + 1)));
+        } else {
+            componentList.add(Component.text("[下一页]", sub_color));
         }
         TextComponent.Builder builder = Component.text();
         for (Component component : componentList) {