search

rime / weasel

【小狼毫】Rime for Windows
https://rime.im
GNU General Public License v3.0
4.64k stars 555 forks source link

[Bug] hilite_spacing 小于 hilite_padding_x 或者 hilite_padding 时不生效 #1001

Closed fbewivpjsbsby closed 1 year ago

fbewivpjsbsby commented 1 year ago

上报前请检查

操作系统信息

描述遇到的问题 hilite_spacing 小于 hilite_padding_x 或者 hilite_padding 时不生效

复现步骤 重现问题的步骤，如：

  1. 更改 weasel.custom.yaml 中的 style/layout/hilite_spacing 小于 style/layout/hilite_padding_x
  2. 重新部署
  3. 输入文字查看没有生效

预期行为 当 style/layout/hilite_spacing 小于 style/layout/hilite_padding_x 时，候选和标签的间隔小于 hilite_padding_x

用户文件

weasel.custom.yaml

patch:
  style/layout/hilite_padding_x: 30
  style/layout/hilite_spacing: 0

  style/color_scheme: win10
  style/horizontal: true
  style/inline_preedit: true
  style/layout/border_width: 1
  style/layout/candidate_spacing: 30
  style/layout/margin_x: 15
  style/layout/margin_y: 10
  style/layout/corner_radius: 0
  style/layout/round_corner: 0
  # style/layout/hilite_padding: 15
  style/layout/hilite_padding_y: 15
  style/font_point: 13

  style/layout/hilite_padding_x: 30
  style/layout/hilite_spacing: 0

  "preset_color_schemes/win10":
    name: Windows10
    author: me
    text_color: 0x000000
    candidate_text_color: 0x000000
    back_color: 0xFFFFFF
    border_color: 0x7E7969
    hilited_text_color: 0xFFFFFF
    hilited_back_color: 0x7E7969
    hilited_candidate_text_color: 0xFFFFFF
    hilited_candidate_back_color: 0x7E7969

build/weasel.yaml

Details

```yaml __build_info: rime_version: 1.9.0 timestamps: weasel: * weasel.custom: * app_options: cmd.exe: ascii_mode: true conhost.exe: ascii_mode: true config_version: 0.22 preset_color_schemes: android: author: "Patricivs " back_color: 0x99731c border_color: 0x99731c candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0x99731c hilited_candidate_back_color: 0x50c4a8 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0x50c4a8 label_color: 0xc18835 name: "安卓／Android" text_color: 0xffffff aqua: author: "佛振 " back_color: 0xeceeee border_color: 0xe0e0e0 candidate_back_color: 0xeceeee candidate_shadow_color: 0x00000000 candidate_text_color: 0x000000 hilited_back_color: 0xd4d4d4 hilited_candidate_back_color: 0xfa3a0a hilited_candidate_shadow_color: 0x00000000 hilited_candidate_text_color: 0xffffff hilited_shadow_color: 0x00000000 hilited_text_color: 0x000000 name: "碧水／Aqua" shadow_color: 0x00000000 text_color: 0x000000 azure: author: "佛振 " back_color: 0x8b4e01 border_color: 0x8b4e01 candidate_text_color: 0xfff8ee comment_text_color: 0xc69664 hilited_back_color: 0x8b4e01 hilited_candidate_back_color: 0xa95e01 hilited_candidate_text_color: 0x7ffeff hilited_text_color: 0xfff8ee name: "青天／Azure" text_color: 0xffe8ca brasil: author: "Patricivs " back_color: 0x559311 border_color: 0x559311 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0x7d3617 hilited_candidate_back_color: 0x16c7f7 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xffffff label_color: 0xffffff name: "笆悉／Brasil" text_color: 0xffffff brisk: author: "skoj " back_color: 0xffffff border_color: 0x333333 candidate_text_color: 0x575757 hilited_back_color: 0xffffff hilited_candidate_back_color: 0xffffff hilited_candidate_text_color: 0x2238dc hilited_text_color: 0x2238dc name: "輕盈／Brisk" text_color: 0x2238dc cool_breeze: author: "skoj " back_color: 0xFFFBFB border_color: 0xFFAAAA candidate_text_color: 0x009100 hilited_back_color: 0xFFFBFB hilited_candidate_back_color: 0xFFD6AC hilited_candidate_text_color: 0x6F003A hilited_text_color: 0x0000CE name: "清風／Cool Breeze" text_color: 0x0000FF dark_temple: author: "佛振 , based on ir_black" back_color: 0x222222 border_color: 0x222222 candidate_text_color: 0xd8e3e6 comment_text_color: 0x606cff hilited_back_color: 0x222222 hilited_candidate_back_color: 0x333333 hilited_candidate_text_color: 0x92f6da hilited_text_color: 0xffcf9a name: "暗堂／Dark Temple" text_color: 0x92f6da doraemon: author: "Patricivs " back_color: 0xffffff border_color: 0xe89f00 candidate_text_color: 0xe89f00 comment_text_color: 0xe89f00 hilited_back_color: 0x1200e5 hilited_candidate_back_color: 0xe89f00 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xffffff label_color: 0xe89f00 name: "銅鑼衛門／Doraemon" text_color: 0x1200e5 dota_2: author: "Patricivs " back_color: 0x120f10 border_color: 0x120f10 candidate_text_color: 0x5c758f comment_text_color: 0x5c758f hilited_back_color: 0x120f10 hilited_candidate_back_color: 0x1841dd hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0x1841dd label_color: 0x5c758f name: "DOTA 2" text_color: 0xffffff espagna: author: "Patricivs " back_color: 0x230dc3 border_color: 0x230dc3 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0x2cb5f7 hilited_candidate_back_color: 0x2cb5f7 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xffffff label_color: 0xffffff name: "埃斯巴尼亞／España" text_color: 0xffffff flypy: author: "Pal.lxk " back_color: 0xffffff border_color: 0xc6c6c6 candidate_text_color: 0xff8000 comment_text_color: 0xff8000 hilited_back_color: 0xffffff hilited_candidate_back_color: 0xffffff hilited_candidate_text_color: 0x0000b0 hilited_comment_text_color: 0x0000b0 hilited_text_color: 0xff8000 label_color: 0xff8000 name: "小鹤飞扬／flypy" text_color: 0x000000 gholabok: author: "Patricivs " back_color: 0x2939e8 border_color: 0x2939e8 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0x437b00 hilited_candidate_back_color: 0x3d6ded hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xffffff label_color: 0xffffff name: "胡蘿菔／Gholabok" text_color: 0xffffff google: author: "skoj " back_color: 0xFFFFFF border_color: 0xE2E2E2 candidate_text_color: 0x000000 hilited_back_color: 0xFFFFFF hilited_candidate_back_color: 0xCE7539 hilited_candidate_text_color: 0xFFFFFF hilited_text_color: 0x000000 name: "谷歌／Google" text_color: 0x666666 google_plus: author: "Patricivs " back_color: 0xffffff border_color: 0x394bdd candidate_text_color: 0x394bdd comment_text_color: 0xcac9c8 hilited_back_color: 0xffffff hilited_candidate_back_color: 0x394bdd hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0x394bdd label_color: 0xcac9c8 name: "Google+" text_color: 0xcac9c8 ink: author: "佛振 " back_color: 0xffffff border_color: 0x000000 hilited_back_color: 0xdddddd hilited_candidate_back_color: 0x000000 hilited_candidate_text_color: 0xffffff hilited_text_color: 0x000000 name: "墨池／Ink" text_color: 0x000000 kuma_shuzboz: author: "Patricivs " back_color: 0x2db6f8 border_color: 0x2db6f8 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0xffffff hilited_candidate_back_color: 0x000000 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0x2db6f8 label_color: 0xffffff name: "熊出沒／Kuma Shuzboz" text_color: 0x000000 kuon: author: "Patricivs " back_color: 0x70b33e border_color: 0x70b33e candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0xffffff hilited_candidate_back_color: 0xffffff hilited_candidate_text_color: 0x70b33e hilited_comment_text_color: 0x70b33e hilited_text_color: 0x70b33e label_color: 0xffffff name: "琨／Kuon" text_color: 0xffffff lost_temple: author: "佛振 , based on ir_black" back_color: 0x444444 border_color: 0x444444 hilited_back_color: 0x222222 hilited_candidate_back_color: 0x82e6ca hilited_candidate_text_color: 0x000000 hilited_text_color: 0x82e6ca name: "孤寺／Lost Temple" text_color: 0xe8f3f6 lost_temple_with_shadow: author: "佛振 , based on ir_black" back_color: 0x444444 border_color: 0x444444 hilited_back_color: 0x222222 hilited_candidate_back_color: 0x82e6ca hilited_candidate_text_color: 0x000000 hilited_text_color: 0x82e6ca name: "孤寺／Lost Temple" text_color: 0xe8f3f6 luna: author: "佛振 " back_color: 0xffffff border_color: 0xcccccc hilited_back_color: 0x7fffff hilited_candidate_back_color: 0x000000 hilited_candidate_text_color: 0xffffff hilited_text_color: 0x000000 name: "明月／Luna" text_color: 0x000000 macau: author: "Patricivs " back_color: 0x81a300 border_color: 0x81a300 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0x00d9ff hilited_candidate_back_color: 0xffffff hilited_candidate_text_color: 0x00d9ff hilited_comment_text_color: 0x00d9ff hilited_text_color: 0xffffff label_color: 0xffffff name: "澳門／Macau" text_color: 0x00d9ff metroblue: author: "Prcuvu " back_color: 0xffffff border_color: 0xd77800 candidate_text_color: 0x000000 comment_text_color: 0x000000 hilited_back_color: 0xffffff hilited_candidate_back_color: 0xd77800 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_label_color: 0xffffff hilited_text_color: 0x000000 label_color: 0x838383 name: "现代蓝／Metro Blue" text_color: 0x000000 modern_warfare: author: P1461 back_color: 0x0a1b0d border_color: 0x4bad83 candidate_text_color: 0xabfedc comment_text_color: 0xfcfdfb hilited_back_color: 0x030e06 hilited_candidate_back_color: 0x676f63 hilited_candidate_text_color: 0xabfedc hilited_text_color: 0xfbfdfc name: "現代戰爭／Modern Warfare" text_color: 0x14bc70 nba: author: "Patricivs " back_color: 0xb76a00 border_color: 0xb76a00 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0xffffff hilited_candidate_back_color: 0x541ed7 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0x541ed7 label_color: 0xffffff name: NBA text_color: 0xffffff ps4: author: "Patricivs " back_color: 0x000000 border_color: 0x000000 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0x575759 hilited_candidate_back_color: 0xe89f00 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xffffff label_color: 0xffffff name: "遊驛四／PS4" text_color: 0xffffff psionics: author: "雨過之後、佛振" back_color: 0x444444 border_color: 0x444444 candidate_text_color: 0xeeeeee comment_text_color: 0x808080 hilited_back_color: 0x444444 hilited_candidate_back_color: 0xd8bf00 hilited_candidate_label_color: 0xfafafa hilited_candidate_text_color: 0xfafafa hilited_comment_text_color: 0x444444 hilited_text_color: 0xeeeeee name: "幽能／Psionics" text_color: 0xc2c2c2 skype: author: "Patricivs " back_color: 0xefad00 border_color: 0xefad00 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0xffffff hilited_candidate_back_color: 0xffffff hilited_candidate_text_color: 0xefad00 hilited_comment_text_color: 0xefad00 hilited_text_color: 0xefad00 label_color: 0xffffff name: "斯蓋普／Skype" text_color: 0xffffff smurfs: author: "skoj " back_color: 0xbf7817 border_color: 0xf5ede0 candidate_text_color: 0xf6f6f6 comment_text_color: 0xf6f6f6 hilited_back_color: 0xbf7817 hilited_candidate_back_color: 0xdbbc6d hilited_candidate_text_color: 0xf6f6f6 hilited_comment_text_color: 0xf6f6f6 hilited_text_color: 0xdbbc6d label_color: 0xbf7817 name: "藍精靈／Smurfs" text_color: 0xffffff so_young: author: "五磅兔 " back_color: 0xe3f6fd border_color: 0xd5e8ee candidate_text_color: 0x837b65 comment_text_color: 0xd28b26 hilited_back_color: 0xd5e8ee hilited_candidate_back_color: 0x98a12a hilited_candidate_text_color: 0xd5e8ee hilited_comment_text_color: 0xd5e8ee hilited_text_color: 0x969483 label_color: 0xa1a193 name: "致青春／So Young" text_color: 0x8236d3 solarized_rock: author: "Aben , based on Ethan Schoonover's Solarized color scheme" back_color: 0x362b00 border_color: 0x362b00 candidate_text_color: 0x969483 hilited_candidate_back_color: 0x8236d3 hilited_candidate_text_color: 0xffffff hilited_text_color: 0x98a12a name: "曬經石／Solarized Rock" text_color: 0x009985 starcraft: author: "Contralisk , original artwork by Blizzard Entertainment" back_color: 0x000000 border_color: 0x1010a0 candidate_text_color: 0x30bb55 hilited_back_color: 0x000000 hilited_candidate_back_color: 0x000000 hilited_candidate_text_color: 0x60ffa8 hilited_text_color: 0xfecb96 name: "星際我爭霸／StarCraft" text_color: 0xccaa88 starcraft_ii: author: "Patricivs " back_color: 0x29190a border_color: 0x534b46 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0x17100a hilited_candidate_back_color: 0xefad1e hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xffffff label_color: 0xffffff name: "星際爭霸Ⅱ／StarCraft Ⅱ" text_color: 0xffffff steam: author: "Patricivs " back_color: 0x141617 border_color: 0x353638 candidate_text_color: 0xffffff comment_text_color: 0xa7a7a9 hilited_back_color: 0x141617 hilited_candidate_back_color: 0x594231 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xa7a7a9 hilited_text_color: 0xc9cfd1 label_color: 0xffffff name: Steam text_color: 0xcd8c52 tintin: author: "Patricivs " back_color: 0xd99500 border_color: 0xd99500 candidate_text_color: 0xffffff comment_text_color: 0xffffff hilited_back_color: 0xd99500 hilited_candidate_back_color: 0x2164f1 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xf7d891 label_color: 0xffffff name: "丁丁／ Tintin" text_color: 0xffffff wii: author: "Patricivs " back_color: 0xefefef border_color: 0xefefef candidate_text_color: 0x575759 comment_text_color: 0xcac9c8 hilited_back_color: 0xefefef hilited_candidate_back_color: 0xffcc33 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xffcc33 label_color: 0xcac9c8 name: Wii text_color: 0x575759 win10: author: me back_color: 0xFFFFFF border_color: 0x7E7969 candidate_text_color: 0x000000 hilited_back_color: 0x7E7969 hilited_candidate_back_color: 0x7E7969 hilited_candidate_text_color: 0xFFFFFF hilited_text_color: 0xFFFFFF name: Windows10 text_color: 0x000000 xbox_silver: author: "Patricivs " back_color: 0xefeeee border_color: 0xefeeee candidate_text_color: 0x1fc28d comment_text_color: 0x1fc28d hilited_back_color: 0x5bf0b5 hilited_candidate_back_color: 0x448c28 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0xffffff label_color: 0x5bf0b5 name: "銀色叉盒／Xbox Silver" text_color: 0x1fc28d youtube: author: "Patricivs " back_color: 0xdedede border_color: 0xdedede candidate_text_color: 0x000000 comment_text_color: 0x000000 hilited_back_color: 0xffffff hilited_candidate_back_color: 0x230dc3 hilited_candidate_text_color: 0xffffff hilited_comment_text_color: 0xffffff hilited_text_color: 0x230dc3 label_color: 0x000000 name: YouTube text_color: 0x000000 style: antialias_mode: default ascii_tip_follow_cursor: false color_scheme: win10 comment_font_face: "Microsoft YaHei" comment_font_point: 14 display_tray_icon: false font_face: "Microsoft YaHei" font_point: 13 fullscreen: false horizontal: true inline_preedit: true label_font_face: "Microsoft YaHei" label_font_point: 14 label_format: "%s." layout: align_type: center border_width: 1 candidate_spacing: 30 corner_radius: 0 hilite_padding: 2 hilite_padding_x: 30 hilite_padding_y: 15 hilite_spacing: 0 margin_x: 15 margin_y: 10 max_height: 0 max_width: 0 min_height: 0 min_width: 160 round_corner: 0 shadow_offset_x: 4 shadow_offset_y: 4 shadow_radius: 0 spacing: 10 mark_text: "" mouse_hover_ms: 0 paging_on_scroll: false preedit_type: composition vertical_auto_reverse: false vertical_text: false vertical_text_left_to_right: false vertical_text_with_wrap: false ```

截图 图片

其他补充说明 如果有其他补充说明，可以写在这里

fxliang commented 1 year ago

这个是代码预期行为，不是bug https://github.com/rime/weasel/blob/master/RimeWithWeasel/RimeWithWeasel.cpp#L958

https://github.com/rime/weasel/blob/master/RimeWithWeasel/RimeWithWeasel.cpp#L970

fbewivpjsbsby commented 1 year ago

这个是代码预期行为，不是bug https://github.com/rime/weasel/blob/master/RimeWithWeasel/RimeWithWeasel.cpp#L958

https://github.com/rime/weasel/blob/master/RimeWithWeasel/RimeWithWeasel.cpp#L970

那如何实现候选文字和标签序号（第一个箭头）小于候选文字到第二个候选的大小（第二个箭头） 图片

seszu commented 1 year ago

让候选序号和候选文字的距离小于候选项之间的距离确实比这样类似平均分布的看起来更舒服点。

fxliang commented 1 year ago

image 留意上方的preedit区域的padding，如果允许hilite_padding > hilite_space, 就会出现那个caret标识符跨在padding色块上这种情况。 潜在几种方案， 1，上方preedit不做padding, 整体左移 2，允许hilite_padding > hilite_spacing，允许出现跨在padding上这种情况 3，preedit区不使用hilite_spacing而用hilite_padding ，保证不会跨在padding上，但是和旧的逻辑有不一样

ChihSee-Hsie commented 1 year ago

对于使用 inline_preedit 的用户来说，专门的 preedit 区域本来不存在，caret 也不存在，这样就无所谓色块重叠的问题了。

fxliang commented 1 year ago

对于使用 inline_preedit 的用户来说，专门的 preedit 区域本来不存在，caret 也不存在，这样就无所谓色块重叠的问题了。

意思是，如果style/inline_preedit: true时就不作这个比较限制是吗？

fbewivpjsbsby commented 1 year ago

image 留意上方的preedit区域的padding，如果允许hilite_padding > hilite_space, 就会出现那个caret标识符跨在padding色块上这种情况。 潜在几种方案， 1，上方preedit不做padding, 整体左移 2，允许hilite_padding > hilite_spacing，允许出现跨在padding上这种情况 3，preedit区不使用hilite_spacing而用hilite_padding ，保证不会跨在padding上，但是和旧的逻辑有不一样

3 的话是实施后最不会冲突的，但之前用 inline_preedit 的 theme 可能需要改。2 的话可能会导致奇怪的问题。style/inline_preedit: true 时就不作这个比较限制可能是现在比较好的解决方案

ChihSee-Hsie commented 1 year ago

感谢 fxliang 大佬的贡献。但相关的 commit 和 weasel-x64 的 commit 好像只能两者取其一，现在的情况是要 hilite_spacing 就不能部署特大词库，反过来就不能任意设置标签和候选项之间的距离。

fxliang commented 1 year ago

感谢 fxliang 大佬的贡献。但相关的 commit 和 weasel-x64 的 commit 好像只能两者取其一，现在的情况是要 hilite_spacing 就不能部署特大词库，反过来就不能任意设置标签和候选项之间的距离。

拆分pr，大词库部署如果那个报毒解了的话，我另外有一个pr处理这个的。另外我之前也有上传过独立部署的64位工具。 x64上水龙月加了很多tsf关联的东西我没有跟，毕竟tsf不熟

fbewivpjsbsby commented 1 year ago

https://github.com/QianmuZ/weasel/pull/19 这个 pr 已经解决了这个问题，请问是在合并到主线后 close 还是现在就可以 close。

fxliang commented 1 year ago

主线的pr是这个，#1007

不着急，迟点收多点砖头再说吧

Magician62011 commented 2 months ago

您好，请问这个问题依然还是只能在 inline_preedit: true 时才workaround么。因为我是一个 inline_preedit: false的用户，想问一下现在版本更新，有无什么其他的参数配置方法能避免这个问题？

数字和文字间隔过大 hilite_spacing: 0 不生效 p1 将hilite_padding_x 调为0后，间隔问题解决，但无法达到填充的美观度。 p2 我记得之前版本使用过程中好像是没出现这个问题 p3 感谢开发人员关注🌸