summaryrefslogtreecommitdiffstats
path: root/layout
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-10-07 19:46:00 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-10-07 19:46:00 +0200
commit6e48f5e1406913ea87756a971048009e83b46f26 (patch)
treed3be71eed0097a8328bc8fb5652bf6a923ee8c86 /layout
parent323cb98de19b6f63b52d3fde5d7144712384c058 (diff)
downloadUXP-6e48f5e1406913ea87756a971048009e83b46f26.tar
UXP-6e48f5e1406913ea87756a971048009e83b46f26.tar.gz
UXP-6e48f5e1406913ea87756a971048009e83b46f26.tar.lz
UXP-6e48f5e1406913ea87756a971048009e83b46f26.tar.xz
UXP-6e48f5e1406913ea87756a971048009e83b46f26.zip
Make caret width normal/thick behind CJK char configurable.
Fixes #820 (regression).
Diffstat (limited to 'layout')
-rw-r--r--layout/base/nsCaret.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 8ad435950..eca22f3ba 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -117,6 +117,12 @@ IsBidiUI()
return Preferences::GetBool("bidi.browser.ui");
}
+static bool
+CjkThickCaret()
+{
+ return Preferences::GetBool("layout.cjkthickcaret");
+}
+
nsCaret::nsCaret()
: mOverrideOffset(0)
, mBlinkCount(-1)
@@ -190,7 +196,7 @@ nsCaret::ComputeMetrics(nsIFrame* aFrame, int32_t aOffset, nscoord aCaretHeight)
nsPresContext::CSSPixelsToAppUnits(
LookAndFeel::GetInt(LookAndFeel::eIntID_CaretWidth, 1));
- if (DrawCJKCaret(aFrame, aOffset)) {
+ if (DrawCJKCaret(aFrame, aOffset) && CjkThickCaret()) {
caretWidth += nsPresContext::CSSPixelsToAppUnits(1);
}
nscoord bidiIndicatorSize = nsPresContext::CSSPixelsToAppUnits(kMinBidiIndicatorPixels);