Minor fixes

akiyosi · Dec 31, 2022 · f3e0480 · f3e0480
1 parent 363bdda
commit f3e0480
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/editor/imetooltip.go b/editor/imetooltip.go
@@ -169,12 +169,12 @@ func (i *IMETooltip) parsePreeditString(preeditStr string) {
 	h := &Highlight{}
 	g.foreground = i.s.ws.foreground
 	g.background = i.s.ws.background
-	if i.s.ws.screenbg == "dark" {
-		h.foreground = warpColor(editor.colors.fg, 30)
-		h.background = warpColor(editor.colors.bg, 30)
+	if i.s.ws.screenbg == "light" {
+		h.foreground = warpColor(i.s.ws.background, -30)
+		h.background = warpColor(i.s.ws.foreground, -30)
 	} else {
-		h.foreground = warpColor(editor.colors.fg, -30)
-		h.background = warpColor(editor.colors.fg, -30)
+		h.foreground = warpColor(i.s.ws.foreground, 30)
+		h.background = warpColor(i.s.ws.background, 30)
 	}
 	h.underline = true
 

diff --git a/editor/workspace.go b/editor/workspace.go
@@ -2815,6 +2815,12 @@ func (w *Workspace) InputMethodEvent(event *gui.QInputMethodEvent) {
 
 // InputMethodQuery is
 func (w *Workspace) InputMethodQuery(query core.Qt__InputMethodQuery) *core.QVariant {
+	if w.screen == nil {
+		return core.NewQVariant()
+	}
+	if w.screen.tooltip == nil {
+		return core.NewQVariant()
+	}
 	if !w.screen.tooltip.isShown {
 		return core.NewQVariant()
 	}