chunquedong avatar chunquedong committed d1ab7a5 Draft

Fixed the font is null

Comments (0)

Files changed (2)

gui/fgfxFwt/fan/FwtWindow.fan

 
   override Void repaint(Rect? dirty := null)
   {
-    canvas.repaint(gfx::Rect(dirty.x, dirty.y, dirty.w, dirty.h))
+    if (dirty == null) canvas.repaint
+    else canvas.repaint(gfx::Rect(dirty.x, dirty.y, dirty.w, dirty.h))
   }
 
   override Size size()

gui/fgfxFwt/java/fan/fgfxFwt/SwtGraphics.java

   public Graphics drawText(String text, long x, long y)
   {
     int flags = SWT.DRAW_DELIMITER | SWT.DRAW_TAB | SWT.DRAW_TRANSPARENT;
-    gc.drawText(text, (int)x, (int)(y-this.font.height()), flags);
+    int outline = (this.font == null) ? 0 : (int)this.font.height();
+    gc.drawText(text, (int)x, (int)(y-outline), flags);
     return this;
   }
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.