fixup

Author: akiyosi

editor/guiwidget.go

@@ -155,11 +155,14 @@ func (w *Workspace) handleRPCGuiwidgetview(updates []interface{}) {
 			switch g.mime {
 			case "text/plain":
 				baseFont := g.s.ws.font
-				g.font = initFontNew(
-					baseFont.fontNew.Family(),
-					float64(g.height*baseFont.height)*0.8,
-					0,
-					0,
+				g.setFont(
+					// Set font adjusted to widgets height
+					initFontNew(
+						baseFont.fontNew.Family(),
+						float64(baseFont.height*g.height)*0.7,
+						0,
+						0,
+					),
 				)
 			default:
 			}

editor/imetooltip.go

@@ -149,7 +149,7 @@ func (i *IMETooltip) updateVirtualCursorPos() {
 				i.cursorVisualPos = int(x)
 				return
 			}
-			x += chunk.width
+			x += float64(chunk.scale) * i.font.cellwidth
 			k++
 		}
 	}

editor/tooltip.go

@@ -11,7 +11,7 @@ import (
 type ColorStr struct {
 	hl    *Highlight
 	str   string
-	width float64
+	scale int
 }
 
 // Tooltip is the tooltip
@@ -59,15 +59,17 @@ func (t *Tooltip) drawContent(p *gui.QPainter, f func(*gui.QPainter)) {
 		r := []rune(chunk.str)
 		for _, rr := range r {
 			// draw background
-			p.FillRect4(
-				core.NewQRectF4(
-					x,
-					y,
-					chunk.width,
-					height,
-				),
-				bg.QColor(),
-			)
+			if !bg.equals(t.s.ws.background) {
+				p.FillRect4(
+					core.NewQRectF4(
+						x,
+						y,
+						float64(chunk.scale)*t.font.cellwidth,
+						height,
+					),
+					bg.QColor(),
+				)
+			}
 
 			// set italic
 			if italic {
@@ -96,14 +98,14 @@ func (t *Tooltip) drawContent(p *gui.QPainter, f func(*gui.QPainter)) {
 					core.NewQRectF4(
 						x,
 						y+height-underlinePos,
-						chunk.width,
+						float64(chunk.scale)*t.font.cellwidth,
 						underlinePos,
 					),
 					fg.QColor(),
 				)
 			}
 
-			x += chunk.width
+			x += float64(chunk.scale) * t.font.cellwidth
 		}
 	}
 }
@@ -149,21 +151,25 @@ func (t *Tooltip) updateText(hl *Highlight, str string) {
 	// rune text
 	r := []rune(str)
 
+	var preScale int
 	var preStrWidth float64
 	var buffer bytes.Buffer
 	for k, rr := range r {
 
 		// detect char width based cell width
 		w := font.cellwidth
+		scale := 1
 		for {
 			cwidth := font.fontMetrics.HorizontalAdvance(string(rr), -1)
 			if cwidth <= w {
 				break
 			}
 			w += font.cellwidth
+			scale++
 		}
 		if preStrWidth == 0 {
 			preStrWidth = w
+			preScale = scale
 		}
 
 		if preStrWidth == w {
@@ -176,23 +182,26 @@ func (t *Tooltip) updateText(hl *Highlight, str string) {
 		if buffer.Len() != 0 {
 
 			t.text = append(t.text, &ColorStr{
-				hl:    hl,
-				str:   buffer.String(),
-				width: preStrWidth,
+				hl:  hl,
+				str: buffer.String(),
+				// width: preStrWidth,
+				scale: preScale,
 			})
 
 			buffer.Reset()
 			buffer.WriteString(string(rr))
 
 			if preStrWidth != w && k == len(r)-1 {
 				t.text = append(t.text, &ColorStr{
-					hl:    hl,
-					str:   buffer.String(),
-					width: w,
+					hl:  hl,
+					str: buffer.String(),
+					// width: w,
+					scale: scale,
 				})
 			}
 
 			preStrWidth = w
+			preScale = scale
 		}
 
 	}
@@ -219,7 +228,7 @@ func (t *Tooltip) update() {
 	for _, chunk := range t.text {
 		r := []rune(chunk.str)
 		for _, _ = range r {
-			tooltipWidth += chunk.width
+			tooltipWidth += float64(chunk.scale) * t.font.cellwidth
 		}
 	}
 

editor/window.go

@@ -2741,7 +2741,6 @@ func (g *Guiwidget) drawText(x, y, width, height float64, p *gui.QPainter, f fun
 	}
 
 	for _, chunk := range g.text {
-		fmt.Println(chunk)
 
 		fg := chunk.hl.fg()
 		bg := chunk.hl.bg()
@@ -2762,7 +2761,7 @@ func (g *Guiwidget) drawText(x, y, width, height float64, p *gui.QPainter, f fun
 					core.NewQRectF4(
 						x,
 						y,
-						chunk.width,
+						float64(chunk.scale)*g.font.cellwidth,
 						height,
 					),
 					bg.QColor(),
@@ -2796,14 +2795,14 @@ func (g *Guiwidget) drawText(x, y, width, height float64, p *gui.QPainter, f fun
 					core.NewQRectF4(
 						x,
 						y+height-underlinePos,
-						chunk.width,
+						float64(chunk.scale)*g.font.cellwidth,
 						underlinePos,
 					),
 					fg.QColor(),
 				)
 			}
 
-			x += chunk.width
+			x += float64(chunk.scale) * g.font.cellwidth
 		}
 	}
 }