Add Progress Bar control

Fixes #71

6 files changed, 41 insertions, 0 deletions

diff --git a/src/nigui/private/gtk3/gtk3.nim b/src/nigui/private/gtk3/gtk3.nim
index 61fc8d4..4992f88 100755
--- a/src/nigui/private/gtk3/gtk3.nim
+++ b/src/nigui/private/gtk3/gtk3.nim
@@ -335,6 +335,9 @@ proc gtk_label_set_ellipsize*(label: pointer, mode: cint) {.importc: "gtk_label_
 proc gtk_label_set_xalign*(label: pointer, xalign: cfloat) {.importc: "gtk_label_set_xalign", libgtk3.}
 proc gtk_label_set_yalign*(label: pointer, yalign: cfloat) {.importc: "gtk_label_set_yalign", libgtk3.}
 
+proc gtk_progress_bar_new*(): pointer {.importc: "gtk_progress_bar_new", libgtk3.}
+proc gtk_progress_bar_set_fraction*(pbar: pointer, fraction: cdouble) {.importc: "gtk_progress_bar_set_fraction", libgtk3.}
+
 # proc gtk_box_new*(orientation: GtkOrientation, spacing: cint): pointer {.importc: "gtk_box_new", libgtk3.}
 proc gtk_box_pack_start*(box, child: pointer, expand, fill: cint, padding: cint) {.importc: "gtk_box_pack_start", libgtk3.}
 
diff --git a/src/nigui/private/gtk3/platform_impl.nim b/src/nigui/private/gtk3/platform_impl.nim
index c5a7fdb..8717198 100755
--- a/src/nigui/private/gtk3/platform_impl.nim
+++ b/src/nigui/private/gtk3/platform_impl.nim
@@ -1357,6 +1357,21 @@ method naturalWidth(label: NativeLabel): int {.locks: "unknown".} = label.getTex
 
 
 # ----------------------------------------------------------------------------------------
+#                                      ProgressBar
+# ----------------------------------------------------------------------------------------
+
+proc init(progressBar: NativeProgressBar) =
+  progressBar.fHandle = gtk_progress_bar_new()
+  progressBar.ProgressBar.init()
+  progressBar.height = 8.scaleToDpi # adjust control height to bar height
+
+method `value=`(progressBar: NativeProgressBar, value: float) =
+  procCall progressBar.ProgressBar.`value=`(value)
+  gtk_progress_bar_set_fraction(progressBar.fHandle, value)
+  app.processEvents()
+
+
+# ----------------------------------------------------------------------------------------
 #                                       TextBox
 # ----------------------------------------------------------------------------------------
 
diff --git a/src/nigui/private/gtk3/platform_types2.nim b/src/nigui/private/gtk3/platform_types2.nim
index 12cf897..a9b5674 100755
--- a/src/nigui/private/gtk3/platform_types2.nim
+++ b/src/nigui/private/gtk3/platform_types2.nim
@@ -15,4 +15,6 @@ type
 
   NativeLabel* = ref object of Label
 
+  NativeProgressBar* = ref object of ProgressBar
+
   NativeTextBox* = ref object of TextBox
diff --git a/src/nigui/private/windows/platform_impl.nim b/src/nigui/private/windows/platform_impl.nim
index c1f9790..2876448 100755
--- a/src/nigui/private/windows/platform_impl.nim
+++ b/src/nigui/private/windows/platform_impl.nim
@@ -1476,6 +1476,23 @@ method `text=`(label: NativeLabel, text: string) =
 
 
 # ----------------------------------------------------------------------------------------
+#                                      ProgressBar
+# ----------------------------------------------------------------------------------------
+
+const pProgressBarMaxValue = 10_000
+
+proc init(progressBar: NativeProgressBar) =
+  progressBar.fHandle = pCreateWindowExWithUserdata("msctls_progress32", WS_CHILD, 0, pDefaultParentWindow, cast[pointer](progressBar))
+  discard SendMessageA(progressBar.fHandle, PBM_SETRANGE32, cast[pointer](0), cast[pointer](pProgressBarMaxValue))
+  progressBar.ProgressBar.init()
+
+method `value=`(progressBar: NativeProgressBar, value: float) =
+  procCall progressBar.ProgressBar.`value=`(value)
+  discard SendMessageA(progressBar.fHandle, PBM_SETPOS, cast[pointer]((value * pProgressBarMaxValue).int32), nil)
+  app.processEvents()
+
+
+# ----------------------------------------------------------------------------------------
 #                                       TextBox
 # ----------------------------------------------------------------------------------------
 
diff --git a/src/nigui/private/windows/platform_types2.nim b/src/nigui/private/windows/platform_types2.nim
index 0dfe32b..986b847 100755
--- a/src/nigui/private/windows/platform_types2.nim
+++ b/src/nigui/private/windows/platform_types2.nim
@@ -15,4 +15,6 @@ type
 

   NativeLabel* = ref object of Label

 

+  NativeProgressBar* = ref object of ProgressBar

+

   NativeTextBox* = ref object of TextBox

diff --git a/src/nigui/private/windows/windows.nim b/src/nigui/private/windows/windows.nim
index c3a8845..5defd80 100755
--- a/src/nigui/private/windows/windows.nim
+++ b/src/nigui/private/windows/windows.nim
@@ -76,6 +76,8 @@ const
   IMAGE_ICON* = 1
   # LR_LOADFROMFILE* = 16
   OBJ_BRUSH* = 2
+  PBM_SETPOS* = 1026
+  PBM_SETRANGE32* = 1030
   PM_REMOVE* = 1
   SB_HORZ* = 0
   SB_THUMBPOSITION* = 4