aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx14
1 files changed, 5 insertions, 9 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index b128f6e30..5b88b715c 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -2674,7 +2674,7 @@ int ScintillaWin::SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) noex
}
bool ScintillaWin::GetScrollInfo(int nBar, LPSCROLLINFO lpsi) noexcept {
- return ::GetScrollInfo(MainHWND(), nBar, lpsi) ? true : false;
+ return ::GetScrollInfo(MainHWND(), nBar, lpsi);
}
// Change the scroll position but avoid repaint if changing to same value
@@ -3343,7 +3343,7 @@ void ScintillaWin::ImeStartComposition() {
// The logfont for the IME is recreated here.
const int styleHere = pdoc->StyleIndexAt(sel.MainCaret());
LOGFONTW lf = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L""};
- int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel * FontSizeMultiplier;
+ int sizeZoomed = vs.styles[styleHere].size + (vs.zoomLevel * FontSizeMultiplier);
if (sizeZoomed <= 2 * FontSizeMultiplier) // Hangs if sizeZoomed <= 1
sizeZoomed = 2 * FontSizeMultiplier;
// The negative is to allow for leading
@@ -3888,13 +3888,9 @@ bool ScintillaWin::Unregister() noexcept {
}
bool ScintillaWin::HasCaretSizeChanged() const noexcept {
- if (
- ( (0 != vs.caret.width) && (sysCaretWidth != vs.caret.width) )
- || ((0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight))
- ) {
- return true;
- }
- return false;
+ return
+ ((0 != vs.caret.width) && (sysCaretWidth != vs.caret.width))
+ || ((0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight));
}
BOOL ScintillaWin::CreateSystemCaret() {