Changed fontSize type from int to float

3 files changed, 22 insertions, 22 deletions

diff --git a/src/nigui.nim b/src/nigui.nim
index fef6fcc..a3acf7c 100755
--- a/src/nigui.nim
+++ b/src/nigui.nim
@@ -177,7 +177,7 @@ type
     fXScrollPos, fYScrollPos: int
     fScrollableWidth, fScrollableHeight: int
     fFontFamily: string
-    fFontSize: int
+    fFontSize: float
     fTextColor: Color
     fBackgroundColor: Color
     fUseDefaultFontFamily: bool
@@ -201,7 +201,7 @@ type
     fWidth: int
     fHeight: int
     fFontFamily: string
-    fFontSize: int
+    fFontSize: float
     fTextColor: Color
     fLineColor: Color
     fAreaColor: Color
@@ -370,8 +370,8 @@ proc `defaultTextColor=`*(app: App, color: Color)
 proc defaultFontFamily*(app: App): string
 proc `defaultFontFamily=`*(app: App, fontFamily: string)
 
-proc defaultFontSize*(app: App): int
-proc `defaultFontSize=`*(app: App, fontSize: int)
+proc defaultFontSize*(app: App): float
+proc `defaultFontSize=`*(app: App, fontSize: float)
 
 proc clipboardText*(app: App): string
 proc `clipboardText=`*(app: App, text: string)
@@ -433,8 +433,8 @@ method height*(canvas: Canvas): int
 method fontFamily*(canvas: Canvas): string
 method `fontFamily=`*(canvas: Canvas, fontFamily: string)
 
-method fontSize*(canvas: Canvas): int
-method `fontSize=`*(canvas: Canvas, fontSize: int)
+method fontSize*(canvas: Canvas): float
+method `fontSize=`*(canvas: Canvas, fontSize: float)
 
 method textColor*(canvas: Canvas): Color
 method `textColor=`*(canvas: Canvas, color: Color)
@@ -677,9 +677,9 @@ method `fontFamily=`*(control: Control, fontFamily: string)
 method setFontFamily*(control: Control, fontFamily: string)
 method resetFontFamily*(control: Control)
 
-method fontSize*(control: Control): int
-method `fontSize=`*(control: Control, fontSize: int)
-method setFontSize*(control: Control, fontSize: int)
+method fontSize*(control: Control): float
+method `fontSize=`*(control: Control, fontSize: float)
+method setFontSize*(control: Control, fontSize: float)
 method resetFontSize*(control: Control)
 
 method backgroundColor*(control: Control): Color
@@ -916,7 +916,7 @@ var fScrollbarSize = -1
 var fDefaultBackgroundColor: Color # initialized by platform-specific init()
 var fDefaultTextColor: Color # initialized by platform-specific init()
 var fDefaultFontFamily = ""
-var fDefaultFontSize = 15
+var fDefaultFontSize = 15.float
 
 
 # ----------------------------------------------------------------------------------------
@@ -1014,7 +1014,7 @@ proc `defaultFontFamily=`(app: App, fontFamily: string) =
     if control != nil:
       control.updateFontFamily()
 
-proc defaultFontSize(app: App): int = fDefaultFontSize
+proc defaultFontSize(app: App): float = fDefaultFontSize
 
 proc updateFontSize(control: Control) =
   if control.fUseDefaultFontSize and control.fontSize != fDefaultFontSize:
@@ -1022,7 +1022,7 @@ proc updateFontSize(control: Control) =
   for child in control.childControls:
     child.updateFontSize()
 
-proc `defaultFontSize=`(app: App, fontSize: int) =
+proc `defaultFontSize=`(app: App, fontSize: float) =
   fDefaultFontSize = fontSize
   for window in windowList:
     let control = window.control
@@ -1074,9 +1074,9 @@ method fontFamily(canvas: Canvas): string = canvas.fFontFamily
 
 method `fontFamily=`(canvas: Canvas, fontFamily: string) = canvas.fFontFamily = fontFamily
 
-method fontSize(canvas: Canvas): int = canvas.fFontSize
+method fontSize(canvas: Canvas): float = canvas.fFontSize
 
-method `fontSize=`(canvas: Canvas, fontSize: int) = canvas.fFontSize = fontSize
+method `fontSize=`(canvas: Canvas, fontSize: float) = canvas.fFontSize = fontSize
 
 method textColor(canvas: Canvas): Color = canvas.fTextColor
 
@@ -1600,13 +1600,13 @@ method resetFontFamily(control: Control) =
   control.setFontFamily(fDefaultFontFamily)
   control.fUseDefaultFontFamily = true
 
-method fontSize(control: Control): int = control.fFontSize
+method fontSize(control: Control): float = control.fFontSize
 
-method `fontSize=`(control: Control, fontSize: int) =
+method `fontSize=`(control: Control, fontSize: float) =
   control.setFontSize(fontSize)
   control.fUseDefaultFontSize = false
 
-method setFontSize(control: Control, fontSize: int) =
+method setFontSize(control: Control, fontSize: float) =
   control.fFontSize = fontSize
   control.triggerRelayoutIfModeIsAuto()
   # should be extended by ControlImpl
diff --git a/src/nigui/private/gtk3/platform_impl.nim b/src/nigui/private/gtk3/platform_impl.nim
index e0635c1..e63083c 100755
--- a/src/nigui/private/gtk3/platform_impl.nim
+++ b/src/nigui/private/gtk3/platform_impl.nim
@@ -488,7 +488,7 @@ method `fontFamily=`(canvas: CanvasImpl, fontFamily: string) =
   procCall canvas.Canvas.`fontFamily=`(fontFamily)
   canvas.fFont = nil
 
-method `fontSize=`(canvas: CanvasImpl, fontSize: int) =
+method `fontSize=`(canvas: CanvasImpl, fontSize: float) =
   procCall canvas.Canvas.`fontSize=`(fontSize)
   canvas.fFont = nil
 
@@ -914,7 +914,7 @@ method setFontFamily(control: ControlImpl, fontFamily: string) =
   procCall control.Control.setFontFamily(fontFamily)
   control.pUpdateFont()
 
-method setFontSize(control: ControlImpl, fontSize: int) =
+method setFontSize(control: ControlImpl, fontSize: float) =
   procCall control.Control.setFontSize(fontSize)
   control.pUpdateFont()
 
diff --git a/src/nigui/private/windows/platform_impl.nim b/src/nigui/private/windows/platform_impl.nim
index 8e072ff..2a27d64 100755
--- a/src/nigui/private/windows/platform_impl.nim
+++ b/src/nigui/private/windows/platform_impl.nim
@@ -535,7 +535,7 @@ proc pUpdateFont(canvas: Canvas) =
   if canvasImpl.fFont == nil:
     var fontFamily: pointer
     pCheckGdiplusStatus(GdipCreateFontFamilyFromName(canvas.fontFamily.pUtf8ToUtf16(), nil, fontFamily))
-    pCheckGdiplusStatus(GdipCreateFont(fontFamily, canvas.fontSize.float, 0, UnitPixel, canvasImpl.fFont))
+    pCheckGdiplusStatus(GdipCreateFont(fontFamily, canvas.fontSize, 0, UnitPixel, canvasImpl.fFont))
     pCheckGdiplusStatus(GdipDeleteFontFamily(fontFamily))
 
 proc pDeleteFont(canvas: CanvasImpl) =
@@ -633,7 +633,7 @@ method `fontFamily=`(canvas: CanvasImpl, fontFamily: string) =
   procCall canvas.Canvas.`fontFamily=`(fontFamily)
   canvas.pDeleteFont()
 
-method `fontSize=`(canvas: CanvasImpl, fontSize: int) =
+method `fontSize=`(canvas: CanvasImpl, fontSize: float) =
   procCall canvas.Canvas.`fontSize=`(fontSize)
   canvas.pDeleteFont()
 
@@ -960,7 +960,7 @@ method setFontFamily(control: ControlImpl, fontFamily: string) =
   procCall control.Control.setFontFamily(fontFamily)
   control.pUpdateFont()
 
-method setFontSize(control: ControlImpl, fontSize: int) =
+method setFontSize(control: ControlImpl, fontSize: float) =
   procCall control.Control.setFontSize(fontSize)
   control.pUpdateFont()