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

Author: eagleoflqj

fcitx5-webview

@@ -157,30 +157,27 @@ WebPanel::WebPanel(Instance *instance)
                 return keyEvent.filterAndAccept();
             }
             if (scrollState_ == candidate_window::scroll_state_t::scrolling) {
-                static const std::vector<
-                    std::pair<Key, candidate_window::scroll_key_action_t>>
-                    selectMap = {
-                        {Key(FcitxKey_1),
-                         candidate_window::scroll_key_action_t::one},
-                        {Key(FcitxKey_2),
-                         candidate_window::scroll_key_action_t::two},
-                        {Key(FcitxKey_3),
-                         candidate_window::scroll_key_action_t::three},
-                        {Key(FcitxKey_4),
-                         candidate_window::scroll_key_action_t::four},
-                        {Key(FcitxKey_5),
-                         candidate_window::scroll_key_action_t::five},
-                        {Key(FcitxKey_6),
-                         candidate_window::scroll_key_action_t::six},
+                static const std::vector<candidate_window::scroll_key_action_t>
+                    selectActions = {
+                        candidate_window::scroll_key_action_t::one,
+                        candidate_window::scroll_key_action_t::two,
+                        candidate_window::scroll_key_action_t::three,
+                        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,
                     };
-                for (const auto &pair : selectMap) {
-                    if (key.check(pair.first)) {
-                        if (keyEvent.isRelease()) {
-                            return;
-                        }
-                        window_->scroll_key_action(pair.second);
-                        return keyEvent.filterAndAccept();
+                if (int i =
+                        key.keyListIndex(*config_.scrollMode->selectCandidate);
+                    i >= 0 && i < selectActions.size()) {
+                    if (keyEvent.isRelease()) {
+                        return;
                     }
+                    window_->scroll_key_action(selectActions[i]);
+                    return keyEvent.filterAndAccept();
                 }
                 const std::vector<std::pair<
                     Option<KeyList>, candidate_window::scroll_key_action_t>>
@@ -504,8 +501,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

@@ -200,6 +200,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{
@@ -218,6 +220,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), Key(FcitxKey_7), Key(FcitxKey_8),
+         Key(FcitxKey_9), Key(FcitxKey_0)}};
     Option<bool> optimizeForHyperKey{this, "OptimizeForHyperKey",
                                      _("Optimize for Hyper key"), true};);
 
@@ -311,6 +320,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)};);