scroll mode: configurable max column count and cell width (#272)

Author: eagleoflqj

assets/po/zh_CN.po

@@ -111,7 +111,7 @@ msgstr "闪烁"
 msgid "Static"
 msgstr "静止"
 
-#: webpanel/webpanel.h:30 webpanel/webpanel.h:34 webpanel/webpanel.h:286
+#: webpanel/webpanel.h:30 webpanel/webpanel.h:34 webpanel/webpanel.h:289
 msgid "Text"
 msgstr "文本"
 
@@ -244,249 +244,257 @@ msgid "Max row count"
 msgstr "最大行数"
 
 #: webpanel/webpanel.h:206
+msgid "Max column count"
+msgstr "最大列数"
+
+#: webpanel/webpanel.h:208
 msgid "Expand"
 msgstr "展开"
 
-#: webpanel/webpanel.h:208
+#: webpanel/webpanel.h:210
 msgid "Collapse"
 msgstr "折叠"
 
-#: webpanel/webpanel.h:210
+#: webpanel/webpanel.h:212
 msgid "Up"
 msgstr "上"
 
-#: webpanel/webpanel.h:212
+#: webpanel/webpanel.h:214
 msgid "Down"
 msgstr "下"
 
-#: webpanel/webpanel.h:213
+#: webpanel/webpanel.h:215
 msgid "Left"
 msgstr "左"
 
-#: webpanel/webpanel.h:214
+#: webpanel/webpanel.h:216
 msgid "Right"
 msgstr "右"
 
-#: webpanel/webpanel.h:216
+#: webpanel/webpanel.h:218
 msgid "Row start"
 msgstr "行首"
 
-#: webpanel/webpanel.h:217
+#: webpanel/webpanel.h:219
 msgid "Row end"
 msgstr "行尾"
 
-#: webpanel/webpanel.h:219
+#: webpanel/webpanel.h:221
 msgid "Page up"
 msgstr "上一页"
 
-#: webpanel/webpanel.h:221
+#: webpanel/webpanel.h:223
 msgid "Page down"
 msgstr "下一页"
 
-#: webpanel/webpanel.h:222
+#: webpanel/webpanel.h:224
 msgid "Commit"
 msgstr "提交"
 
-#: webpanel/webpanel.h:225
+#: webpanel/webpanel.h:228
 msgid "Select candidate"
 msgstr "选词"
 
-#: webpanel/webpanel.h:230
+#: webpanel/webpanel.h:233
 msgid "Optimize for Hyper key"
 msgstr "针对 Hyper 键优化"
 
-#: webpanel/webpanel.h:236
+#: webpanel/webpanel.h:239
 msgid "Layout"
 msgstr "布局"
 
-#: webpanel/webpanel.h:240
+#: webpanel/webpanel.h:243
 msgid "Writing mode"
 msgstr "书写模式"
 
-#: webpanel/webpanel.h:243
+#: webpanel/webpanel.h:246
 msgid "Typography awareness for IM"
 msgstr "输入法感知版式"
 
-#: webpanel/webpanel.h:247
+#: webpanel/webpanel.h:250
 msgid "Paging buttons style"
 msgstr "翻页按钮样式"
 
-#: webpanel/webpanel.h:252
+#: webpanel/webpanel.h:255
 msgid "Image"
 msgstr "图片"
 
-#: webpanel/webpanel.h:253
+#: webpanel/webpanel.h:256
 msgid "Blur"
 msgstr "模糊"
 
-#: webpanel/webpanel.h:254
+#: webpanel/webpanel.h:257
 msgid "Shadow"
 msgstr "阴影"
 
-#: webpanel/webpanel.h:262
+#: webpanel/webpanel.h:265
 msgid "Text font family"
 msgstr "文本字体族"
 
-#: webpanel/webpanel.h:264
+#: webpanel/webpanel.h:267
 msgid "Text font size"
 msgstr "文本字号"
 
-#: webpanel/webpanel.h:266
+#: webpanel/webpanel.h:269
 msgid "Label font family"
 msgstr "标签字体族"
 
-#: webpanel/webpanel.h:268
+#: webpanel/webpanel.h:271
 msgid "Label font size"
 msgstr "标签字号"
 
-#: webpanel/webpanel.h:270
+#: webpanel/webpanel.h:273
 msgid "Comment font family"
 msgstr "注释字体族"
 
-#: webpanel/webpanel.h:272
+#: webpanel/webpanel.h:275
 msgid "Comment font size"
 msgstr "注释字号"
 
-#: webpanel/webpanel.h:275
+#: webpanel/webpanel.h:278
 msgid "Preedit font family"
 msgstr "预编辑字体族"
 
-#: webpanel/webpanel.h:277
+#: webpanel/webpanel.h:280
 msgid "Preedit font size"
 msgstr "预编辑字号"
 
-#: webpanel/webpanel.h:279
+#: webpanel/webpanel.h:282
 msgid "User font dir"
 msgstr "用户字体目录"
 
-#: webpanel/webpanel.h:280
+#: webpanel/webpanel.h:283
 msgid "System font dir"
 msgstr "系统字体目录"
 
-#: webpanel/webpanel.h:285
+#: webpanel/webpanel.h:288
 msgid "Style"
 msgstr "样式"
 
-#: webpanel/webpanel.h:291
+#: webpanel/webpanel.h:294
 msgid "Mark style"
 msgstr "标记样式"
 
-#: webpanel/webpanel.h:292
+#: webpanel/webpanel.h:295
 msgid "Mark text"
 msgstr "标记文本"
 
-#: webpanel/webpanel.h:294
+#: webpanel/webpanel.h:297
 msgid "Hover behavior"
 msgstr "悬停行为"
 
-#: webpanel/webpanel.h:300
+#: webpanel/webpanel.h:303
 msgid "Border width (px)"
 msgstr "边框宽度（px）"
 
-#: webpanel/webpanel.h:303
+#: webpanel/webpanel.h:306
 msgid "Border radius (px)"
 msgstr "边框半径（px）"
 
-#: webpanel/webpanel.h:304
+#: webpanel/webpanel.h:307
 msgid "Margin (px)"
 msgstr "外边距（px）"
 
-#: webpanel/webpanel.h:307
+#: webpanel/webpanel.h:310
 msgid "Highlight radius (px)"
 msgstr "高亮半径（px）"
 
-#: webpanel/webpanel.h:310
+#: webpanel/webpanel.h:313
 msgid "Top padding (px)"
 msgstr "顶填充（px）"
 
-#: webpanel/webpanel.h:312
+#: webpanel/webpanel.h:315
 msgid "Right padding (px)"
 msgstr "右填充（px）"
 
-#: webpanel/webpanel.h:314
+#: webpanel/webpanel.h:317
 msgid "Bottom padding (px)"
 msgstr "底填充（px）"
 
-#: webpanel/webpanel.h:317
+#: webpanel/webpanel.h:320
 msgid "Left padding (px)"
 msgstr "左填充（px）"
 
-#: webpanel/webpanel.h:319
+#: webpanel/webpanel.h:322
 msgid "Gap between label, text and comment (px)"
 msgstr "标签、文本、注释间隔（px）"
 
-#: webpanel/webpanel.h:322
+#: webpanel/webpanel.h:325
 msgid "Vertical minimum width (px)"
 msgstr "垂直时最小宽度（px）"
 
-#: webpanel/webpanel.h:325
+#: webpanel/webpanel.h:328
+msgid "Scroll cell width (px)"
+msgstr "卷轴单元格宽度 (px)"
+
+#: webpanel/webpanel.h:331
 msgid "Horizontal divider width (px)"
 msgstr "水平分隔线宽度（px）"
 
-#: webpanel/webpanel.h:334
+#: webpanel/webpanel.h:340
 msgid "User CSS"
 msgstr "用户 CSS"
 
-#: webpanel/webpanel.h:335
+#: webpanel/webpanel.h:341
 msgid "Copy HTML"
 msgstr "复制 HTML"
 
-#: webpanel/webpanel.h:336
+#: webpanel/webpanel.h:342
 msgid "Plugin dir"
 msgstr "插件目录"
 
-#: webpanel/webpanel.h:338
+#: webpanel/webpanel.h:344
 msgid "I know there may be risks for using plugins"
 msgstr "我知道使用插件可能有风险"
 
-#: webpanel/webpanel.h:341
+#: webpanel/webpanel.h:347
 msgid "Plugins"
 msgstr "插件"
 
-#: webpanel/webpanel.h:343
+#: webpanel/webpanel.h:349
 msgid "Dangerous API for JavaScript plugins"
 msgstr "用于 JavaScript 插件的危险 API"
 
-#: webpanel/webpanel.h:346
+#: webpanel/webpanel.h:352
 msgid "Basic"
 msgstr "基础"
 
-#: webpanel/webpanel.h:347
+#: webpanel/webpanel.h:353
 msgid "Light mode"
 msgstr "浅色模式"
 
-#: webpanel/webpanel.h:348
+#: webpanel/webpanel.h:354
 msgid "Dark mode"
 msgstr "深色模式"
 
-#: webpanel/webpanel.h:349
+#: webpanel/webpanel.h:355
 msgid "Typography"
 msgstr "版式"
 
-#: webpanel/webpanel.h:350
+#: webpanel/webpanel.h:356
 msgid "Scroll mode"
 msgstr "卷轴模式"
 
-#: webpanel/webpanel.h:351
+#: webpanel/webpanel.h:357
 msgid "Background"
 msgstr "背景"
 
-#: webpanel/webpanel.h:352
+#: webpanel/webpanel.h:358
 msgid "Font"
 msgstr "字体"
 
-#: webpanel/webpanel.h:353
+#: webpanel/webpanel.h:359
 msgid "Caret"
 msgstr "光标"
 
-#: webpanel/webpanel.h:354
+#: webpanel/webpanel.h:360
 msgid "Highlight"
 msgstr "高亮"
 
-#: webpanel/webpanel.h:355
+#: webpanel/webpanel.h:361
 msgid "Size"
 msgstr "尺寸"
 
-#: webpanel/webpanel.h:356
+#: webpanel/webpanel.h:362
 msgid "Advanced"
 msgstr "高级"

fcitx5-webview

@@ -171,6 +171,10 @@ WebPanel::WebPanel(Instance *instance)
                         candidate_window::scroll_key_action_t::four,
                         candidate_window::scroll_key_action_t::five,
                         candidate_window::scroll_key_action_t::six,
+                        candidate_window::scroll_key_action_t::seven,
+                        candidate_window::scroll_key_action_t::eight,
+                        candidate_window::scroll_key_action_t::nine,
+                        candidate_window::scroll_key_action_t::zero,
                     };
                 if (int i =
                         key.keyListIndex(*config_.scrollMode->selectCandidate);
@@ -534,8 +538,8 @@ void WebPanel::scroll(int start, int count) {
 }
 
 void WebPanel::expand() {
-    scroll(0, 6 * (*config_.scrollMode->maxRowCount +
-                   1)); // Hard-coded like fcitx5-webview
+    scroll(0, *config_.scrollMode->maxColumnCount *
+                  (*config_.scrollMode->maxRowCount + 1));
 }
 
 void WebPanel::collapse() {

webpanel/webpanel.cpp

@@ -202,6 +202,8 @@ FCITX_CONFIGURATION(
     Option<bool> animation{this, "Animation", _("Animation"), true};
     Option<int, IntConstrain> maxRowCount{
         this, "MaxRowCount", _("Max row count"), 6, IntConstrain(2, 10)};
+    Option<int, IntConstrain> maxColumnCount{
+        this, "MaxColumnCount", _("Max column count"), 6, IntConstrain(2, 10)};
     Option<KeyList> expand{
         this, "Expand", _("Expand"), {Key(FcitxKey_equal), Key(FcitxKey_Down)}};
     Option<KeyList> collapse{
@@ -220,12 +222,13 @@ FCITX_CONFIGURATION(
     Option<KeyList> pageDown{
         this, "PageDown", _("Page down"), {Key(FcitxKey_Page_Down)}};
     Option<KeyList> commit{this, "Commit", _("Commit"), {Key(FcitxKey_space)}};
-    Option<KeyList> selectCandidate{this,
-                                    "SelectCandidate",
-                                    _("Select candidate"),
-                                    {Key(FcitxKey_1), Key(FcitxKey_2),
-                                     Key(FcitxKey_3), Key(FcitxKey_4),
-                                     Key(FcitxKey_5), Key(FcitxKey_6)}};
+    Option<KeyList> selectCandidate{
+        this,
+        "SelectCandidate",
+        _("Select candidate"),
+        {Key(FcitxKey_1), Key(FcitxKey_2), Key(FcitxKey_3), Key(FcitxKey_4),
+         Key(FcitxKey_5), Key(FcitxKey_6), Key(FcitxKey_7), Key(FcitxKey_8),
+         Key(FcitxKey_9), Key(FcitxKey_0)}};
     Option<bool> optimizeForHyperKey{this, "OptimizeForHyperKey",
                                      _("Optimize for Hyper key"), true};);
 
@@ -321,6 +324,9 @@ FCITX_CONFIGURATION(
     Option<int, IntConstrain> verticalMinWidth{this, "VerticalMinWidth",
                                                _("Vertical minimum width (px)"),
                                                200, IntConstrain(0, 960)};
+    Option<int, IntConstrain> scrollCellWidth{this, "ScrollCellWidth",
+                                              _("Scroll cell width (px)"), 65,
+                                              IntConstrain(40, 100)};
     Option<int, IntConstrain> horizontalDividerWidth{
         this, "HorizontalDividerWidth", _("Horizontal divider width (px)"), 1,
         IntConstrain(0, BORDER_WIDTH_MAX)};);