Various improvements #42

iacore · 2022-04-05T14:47:34Z

See commit messages for details.

Deprecated non-standard APIs and added standard ones.

Added onselected methods and fields for RadioButtons

…e example file to show how it works

… to keep the style between the tabs the same, this allows you to do that more easily

Fix cross-compilation to Windows on Linux using x86_64-w64-mingw32-gcc. Linux is case- and slash-sensitive, but Windows should be able to handle both afaik.

* add Grid widget

Fix delete for Box

Araq · 2022-04-06T16:22:15Z

ui.nim

 proc quit*() = rawui.quit()

-proc mainLoop*() =
+proc mainLoop*() {.deprecated: "Use 'main' instead".} =


mainLoop is a much better name for this so don't deprecate it.

Araq · 2022-04-11T15:13:12Z

ui.nim

-  rawui.uninit()
+    if rawui.mainStep(0) == 0: break
+
+proc queueMain*(f: proc (): void {.cdecl.}) =


It should be f: proc () {.cdecl.}, the void is implied.

If you're not sure if the "cast works or not" why add the feature? How are you provide the feature if the cast doesn't work?

ui.nim tries to provide an idiomatic API. Otherwise why would we have the rawui and ui separation?

Araq · 2022-04-11T15:13:55Z

ui.nim

+  rawui.queueMain(cast[proc (_:pointer): void {.cdecl.}](f), nil) # Not sure if this cast works or not
+
+proc queueMain*[T](f: proc (_:T): void {.cdecl.}, p: T) =
+  rawui.queueMain(cast[proc (_:pointer): void {.cdecl.}](f), cast[pointer](p))


Don't add procs that you don't know will work, are low level and are against the spirit of the module.

I don't know how to properly wrap a nim proc into a c proc.

Araq · 2022-04-11T15:15:37Z

ui.nim

@@ -473,11 +502,11 @@ template addMenuItemImpl(ex) =
  menuItemOnClicked(result.impl, wrapmeOnclicked, cast[pointer](result))
  m.children.add result

-proc addItem*(m: Menu; name: string, onclicked: proc()): MenuItem {.discardable.} =
+proc addItem*(m: Menu; name: string, onclicked: proc() = nil): MenuItem {.discardable.} =


Why is = nil now the default? Which kind of items are not clickable? Why not have an addItemFiller proc instead or something like that?

Araq · 2022-04-11T15:17:58Z

ui.nim

+proc addQuitItem*(m: Menu): MenuItem {.discardable.} =
+  addMenuItemImpl(menuAppendQuitItem(m.impl))
+
+proc addQuitItem*(m: Menu, shouldQuit: proc(): bool): MenuItem {.discardable, deprecated:"Register menu action yourself".} =


The old API was ok too.

Araq · 2022-04-11T15:19:10Z

ui.nim

-proc pollingMainLoop*(poll: proc(timeout: int); timeout: int) =
+export rawui.main
+export rawui.mainSteps
+export rawui.mainStep


Why? ui encapsulates rawui. If you need rawui, import it yourself.

Araq · 2022-04-11T15:19:49Z

ui.nim

@@ -140,6 +163,9 @@ proc setChild*(w: Window; child: Widget) =
  windowSetChild(w.impl, child.impl)
  w.child = child

+proc `child=`*(w: Window; c: Widget) =
+  w.setChild(c)


I'm not sure this alias buys us anything.

consistency

Araq · 2022-04-11T15:20:57Z

ui.nim

+  when param2typ is void:
+    block:
+      proc generated_handler(phandler: ptr AreaHandler, _: ptr rawui.Area): rettyp {.cdecl.} =
+        let widget = cast[ptr Area](cast[int](phandler) - offsetOf(AreaObj, handler))


Who knows if this is correct? I don't. Stick to the patterns we already established elsewhere in this codebase for how to wrap callbacks.

This is the proper way. The callback signature for Area is different.

Araq · 2022-04-11T15:23:12Z

ui.nim

+  handler.dragBroken = wrapAreaCallback(onDragBroken)
+  handler.keyEvent = wrapAreaCallback(onKeyEvent, ptr AreaKeyEvent, cint)
+
+  a.handler = handler


Suggested change

a.handler = handler

a.handler = AreaHandler(

draw: ...,

mouseEvent: ...,

mouseCrossed: ...,

...

)

Araq · 2022-04-11T15:24:26Z

ui.nim

+  result.initHandler()
+  result.impl = rawui.newArea(result.handler.addr)
+
+proc newScrollingArea*(width: cint, height: cint): Area =


The rest of the API exposes procs as taking int and converting it to cint in the implementation.

Fix examples to compile. libui is unmaintained.

add Grid widget (#1)

fix cross-compile with mingw

PMunch and others added 12 commits February 26, 2017 03:10

Changed some c -> child for consistency

6c5d6ca

Added onselected methods and fields for RadioButtons

Added genui macro which transforms a DSL into a GUI, also added simpl…

2a3208a

…e example file to show how it works

Added a margined default to Tab. I believe most tabbed containers try…

7d0dc47

… to keep the style between the tabs the same, this allows you to do that more easily

Added macro to create UIs, along with simple file to show how it works

0950d20

Removed some debuging echo statements

41ee2b4

fix cross-compile with mingw

1f35172

Fix cross-compilation to Windows on Linux using x86_64-w64-mingw32-gcc. Linux is case- and slash-sensitive, but Windows should be able to handle both afaik.

add Grid widget (#1)

f808582

* add Grid widget

Add child= to Window

342f54b

Fix delete for Box

Change poll UI

45b770c

Add uninit

c861d7f

Clean up main loop API

2f6a6b3

Add queueMain

646cda7

Araq reviewed Apr 6, 2022

View reviewed changes

Un-deprecate mainLoop

c85b632

Araq reviewed Apr 11, 2022

View reviewed changes

iacore added 7 commits January 25, 2023 18:42

Use libui-ng (instead of libui).

c994c6c

Fix examples to compile. libui is unmaintained.

Merge pull request #1 from agussecur/master

5261489

add Grid widget (#1)

Merge pull request #2 from zargot/bugfix/mingw

d0484b4

fix cross-compile with mingw

Merge branch 'master' of https://github.com/PMunch/ui into pmunch-master

0deeea6

Fix compile errors - genui still broken

4a47e11

Remove genui

2f28c86

Merge modified 'PMunch/master' into HEAD

309f957

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Various improvements #42

Various improvements #42

Uh oh!

iacore commented Apr 5, 2022

Uh oh!

Araq Apr 6, 2022

Uh oh!

iacore Apr 8, 2022

Uh oh!

Araq Apr 11, 2022

Uh oh!

Araq Apr 11, 2022

Uh oh!

iacore Apr 11, 2022

Uh oh!

Araq Apr 11, 2022 •

edited

Loading

Uh oh!

Araq Apr 11, 2022

Uh oh!

Araq Apr 11, 2022

Uh oh!

Araq Apr 11, 2022

Uh oh!

iacore Apr 11, 2022

Uh oh!

Araq Apr 11, 2022

Uh oh!

iacore Apr 11, 2022

Uh oh!

Araq Apr 11, 2022

Uh oh!

Araq Apr 11, 2022

Uh oh!

Uh oh!

-  a.handler = handler
+  a.handler = AreaHandler(
+    draw: ...,
+    mouseEvent: ...,
+    mouseCrossed: ...,
+    ...
+  )

Various improvements #42

Are you sure you want to change the base?

Various improvements #42

Uh oh!

Conversation

iacore commented Apr 5, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Araq Apr 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Araq Apr 11, 2022 •

edited

Loading