Vertical Writing Direction Support #441

LEOYoon-Tsaw · 2020-08-14T18:21:24Z

Add vertical writing direction support, toggled by style/vertical in squirrel.yaml.
Also add a style/baseOffset to provide flexibility in adjusting font baseline.
Should not affect current users, purely additive.

Hard coded, need to adopt controlls

lotem · 2020-08-15T04:26:08Z

SquirrelPanel.m

@@ -47,7 +49,7 @@ - (void)setText:(NSAttributedString *)text
 }

 - (void)setBackgroundColor:(NSColor *)backgroundColor {
-  _backgroundColor = (backgroundColor != nil ? backgroundColor : [NSColor windowBackgroundColor]);
+  NSColor * _backgroundColor = (backgroundColor != nil ? backgroundColor : [NSColor windowBackgroundColor]);


nit: name the local variable backgroundColor. and remove the unused property SquirrelView.backgroundColor

lotem · 2020-08-15T04:31:26Z

SquirrelPanel.m

@@ -128,13 +128,35 @@ @implementation SquirrelPanel {
  NSMutableDictionary *_commentHighlightedAttrs;
  NSMutableDictionary *_preeditAttrs;
  NSMutableDictionary *_preeditHighlightedAttrs;
-  NSParagraphStyle *_paragraphStyle;
-  NSParagraphStyle *_preeditParagraphStyle;
+  NSMutableParagraphStyle *_paragraphStyle;


NSMutableParagraphStyle inherits NSParagraphStyle. No need to change the type.

lotem · 2020-08-15T04:31:44Z

SquirrelPanel.m

-  NSParagraphStyle *_paragraphStyle;
-  NSParagraphStyle *_preeditParagraphStyle;
+  NSMutableParagraphStyle *_paragraphStyle;
+  NSMutableParagraphStyle *_preeditParagraphStyle;


no need to change the type.

lotem · 2020-08-15T04:32:11Z

SquirrelPanel.m

@@ -166,20 +188,20 @@ - (void)initializeUIStyle {
  _preeditHighlightedAttrs[NSForegroundColorAttributeName] = [NSColor controlTextColor];
  _preeditHighlightedAttrs[NSFontAttributeName] = [NSFont userFontOfSize:kDefaultFontSize];

-  _paragraphStyle = [NSParagraphStyle defaultParagraphStyle];
-  _preeditParagraphStyle = [NSParagraphStyle defaultParagraphStyle];
+  _paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];


no need to copy.

lotem · 2020-08-15T04:32:20Z

SquirrelPanel.m

-  _paragraphStyle = [NSParagraphStyle defaultParagraphStyle];
-  _preeditParagraphStyle = [NSParagraphStyle defaultParagraphStyle];
+  _paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+  _preeditParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];


no need to copy.

lotem · 2020-08-15T04:33:42Z

SquirrelPanel.m

+    // if the height is too large, it's hard to read, so need to put limit on the height.
+    if (windowRect.size.height > NSHeight(screenRect) / 3) {
+      windowRect.size.height = NSHeight(screenRect) / 3;
+      windowRect.size.width = [_view.text boundingRectWithSize:NSMakeSize(windowRect.size.height - _view.edgeInset.height * 2, windowRect.size.width - _view.edgeInset.width * 2) options:NSStringDrawingUsesLineFragmentOrigin].size.height + _view.edgeInset.height * 2;


too long a line

lotem · 2020-08-15T05:48:53Z

SquirrelPanel.m

@@ -225,6 +269,14 @@ - (void)show {
    windowRect.origin.y = NSMinY(screenRect);
  }
  // voila !


nit: voila is for the last step.

lotem · 2020-08-15T05:52:48Z

SquirrelPanel.m

+  // rotate the view, the core in vertical mode!
+  if (_vertical) {
+    _view.boundsRotation = -90.0;
+    [_view setBoundsOrigin:NSMakePoint(_view.contentSize.width + _view.edgeInset.width * 2, _view.edgeInset.height * 2)];


why isn't boundsOrigin.y = 0 but _view.edgeInset.height * 2?

Right, this is better, I'm going to change it

lotem · 2020-08-15T05:55:52Z

SquirrelPanel.m

+    if (_inlinePreedit) {
+      windowRect.origin.x -= windowRect.size.width;
+    } else {
+      windowRect.origin.x -= windowRect.size.width - preeditSize.height - _view.edgeInset.width;


_view.edgeInset.width or _view.edgeInset.height?

It depends on how user interpret borderHeight in vertical mode.. There're more places to look at for the consistency. But this edgeInset.width consistency issue can be dealt after all other gardening's done.

lotem · 2020-08-15T06:05:11Z

SquirrelPanel.m

@@ -402,70 +473,116 @@ - (void)showPreedit:(NSString *)preedit
    }

    if (i > 0) {
-      NSAttributedString *separator = [[NSAttributedString alloc]
+      NSMutableAttributedString *separator = [[NSMutableAttributedString alloc]


no need to be mutable.

lotem · 2020-08-15T09:22:51Z

This is a great feature. I need more time to understand the changes.
Take notes here of a few bugs I experienced:

style/horizontal should be disabled when style/vertical is true.
style/base_offset also affects non-vertical mode; prefer applying base offset only to vertical UI so that switching layout direction is as simple as changing one boolean flag.
line wrapping within preedit text or candidate causes window to move away from cursor position. maybe due to measuring window size taken place before breaking lines.
somehow non-vertical UI is affected by 70ba02c

LEOYoon-Tsaw · 2020-08-15T14:49:18Z

style/horizontal should be disabled when style/vertical is true. This is an obvious conflict, but which takes higher priority? Should Squirrel take the vertical or horizontal if both are true, or fail to deploy?
style/base_offset can be useful in other mode, this is the reason I added it for other modes as well, since users might want to vertically align candidates as different fonts have different base line height. But users with out this property will notice no change, it's pure additive.
line wrapping, I center the left-most line of preedit to the cursor y position, so that the candidates area expands to the left and preedit area expand to the right. In inline-edit mode, the first candidate is fixed at the cursor y, so people don't need to track where the first candidate is in vertical mode.
I'll make minimumLineHeight and maximumLineHeight exclusive to vertical mode'.

…et in other modes to config section.

… color, and smooth rounded corners.

lotem · 2020-08-16T14:59:20Z

My config for testing: https://gist.github.com/lotem/4b8ce0742eac3c2a7aafed8b16e645df

…o change arrrow key behaviour

…y dark style

…reedit_back_color set

…reedit_back_color set (cherry picked from commit d2a2859)

…mediately

Support Dark mode

Adopts TextStorage to support general linebreak, a new slim vertical mode (horizontal=true & vertical=true), more advanced highlighting, dark mode autoswitching

… use sRGB.

LEOYoon-Tsaw · 2020-08-25T22:49:15Z

Will solve #403 #412 #422 #397 #129 #367 #374 #289

LEOYoon-Tsaw · 2020-08-29T15:29:57Z

Will refactor the remaining parts for a new pull

LEOYoon-Tsaw added 7 commits August 14, 2020 13:17

Add support for Vertical writing mode

a9c8fc5

Hard coded, need to adopt controlls

Use style/vertical to control vertical layout

2c8778c

Bug fix

ac5a2a8

Gardening

d8a81dc

Fix highlighted box size

77ec8c7

Fix highlighted box with linespace != 0

c11313f

Fix linespace issues in Vertical mode

70ba02c

lotem reviewed Aug 15, 2020

View reviewed changes

LEOYoon-Tsaw and others added 15 commits August 15, 2020 10:53

Gardening v1

7169fef

minor change to coordinate translation

74db919

Remove unused SquirrelView.backgroundColor

c329bb2

Fix a window drifting issue

54291c6

Some gardening, improved vertical baseline calculation, move baseOffs…

5dccdf6

…et in other modes to config section.

Add Support for Border Color and Preedit Background Color

9deeeeb

Change background color rendering, to support transparent highlighted…

9f8bdd1

… color, and smooth rounded corners.

Fix a bug when using multiple screens.

59530ed

Fix a bug when using multiple screens

eaf351a

A minor bug

5c9877a

Optimize height calculation in vertical mode

92fff88

Optimize window height calculation in vertical mode

a028f3c

set rime context option "_vertical" to change arrrow key behaviour

bae106b

feat: support select_labels

8bf4e56

Fix bug where label is not properly aligned

b5b5967

LEOYoon-Tsaw added 4 commits August 16, 2020 11:16

Improve edge detection when hilighted corner radius is 0

dd572d8

Fixed bugs in close edge detection and improper label rendering

f7ec136

fix bugs that preedit area not properly calculated

36f43f4

feat: support select_labels and set rime context option "_vertical" t…

9703ed8

…o change arrrow key behaviour

LEOYoon-Tsaw added 22 commits August 21, 2020 01:05

Fix a bug in retaining window width

a6dcf3a

Support Dark mode on MacOS 14+, use style/color_scheme_dark to specif…

e18d95d

…y dark style

Bug fix

2278540

No need to config for dark if dark style not set.

a8a812b

Fix a bug where transparent hilited_back_color doesnot work without p…

d2a2859

…reedit_back_color set

Fix a bug where transparent hilited_back_color doesnot work without p…

fae4aca

…reedit_back_color set (cherry picked from commit d2a2859)

fix bug

e98edc5

Fix bug

0b5eb82

fix a bug that when switching appearance, new style will not apply im…

18142c0

…mediately

Merge branch 'Linebreak' into DarkMode

1b6a58b

Merge pull request #1 from LEOYoon-Tsaw/DarkMode

9b152de

Support Dark mode

Merge branch 'Vertical' into Linebreak

be06ae8

Merge pull request #2 from LEOYoon-Tsaw/Linebreak

8feb0a3

Adopts TextStorage to support general linebreak, a new slim vertical mode (horizontal=true & vertical=true), more advanced highlighting, dark mode autoswitching

Final Gardening. Done.

2597096

Fix a bug where height retaining doesn't work if there's only one line

2c84e44

Gardening

1bdf5f2

Fix a bug where layout direction won't follow dark theme in dark mode

315e58a

Add an in_display_p3 for specifying display P3 color space, otherwise…

27d7b36

… use sRGB.

Fix a bug where base_offset does not work in vertical mode

315cf09

Fix minor bugs and gardening

3a7e3e8

Reflect new setting options in squirrel.yaml

5c7c08f

Better vertical alignment

917635e

LEOYoon-Tsaw added 3 commits August 25, 2020 22:45

Optimize vertical alignment

783dc13

Add default background color and fix blendcolor function

543566c

Restore auto switch if found color_scheme_dark

ec85fed

lotem mentioned this pull request Aug 29, 2020

feat: vertical text #447

Merged

LEOYoon-Tsaw closed this Aug 29, 2020

LEOYoon-Tsaw deleted the Vertical branch April 18, 2022 15:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vertical Writing Direction Support #441

Vertical Writing Direction Support #441

LEOYoon-Tsaw commented Aug 14, 2020

lotem Aug 15, 2020

LEOYoon-Tsaw Aug 15, 2020 •

edited

Loading

lotem Aug 15, 2020

lotem Aug 15, 2020

lotem Aug 15, 2020

lotem Aug 15, 2020

lotem Aug 15, 2020

lotem Aug 15, 2020

lotem Aug 15, 2020

LEOYoon-Tsaw Aug 15, 2020 •

edited

Loading

lotem Aug 15, 2020

LEOYoon-Tsaw Aug 15, 2020

lotem Aug 15, 2020

lotem commented Aug 15, 2020 •

edited

Loading

LEOYoon-Tsaw commented Aug 15, 2020

lotem commented Aug 16, 2020

LEOYoon-Tsaw commented Aug 25, 2020 •

edited

Loading

LEOYoon-Tsaw commented Aug 29, 2020

Vertical Writing Direction Support #441

Vertical Writing Direction Support #441

Conversation

LEOYoon-Tsaw commented Aug 14, 2020

Choose a reason for hiding this comment

LEOYoon-Tsaw Aug 15, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LEOYoon-Tsaw Aug 15, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lotem commented Aug 15, 2020 • edited Loading

LEOYoon-Tsaw commented Aug 15, 2020

lotem commented Aug 16, 2020

LEOYoon-Tsaw commented Aug 25, 2020 • edited Loading

LEOYoon-Tsaw commented Aug 29, 2020

LEOYoon-Tsaw Aug 15, 2020 •

edited

Loading

LEOYoon-Tsaw Aug 15, 2020 •

edited

Loading

lotem commented Aug 15, 2020 •

edited

Loading

LEOYoon-Tsaw commented Aug 25, 2020 •

edited

Loading