interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Migrated colorbutton.go back.

This commit is contained in:
Pietro Gagliardi 2018-08-26 17:08:41 -04:00
parent ba8f53fe3e
commit 247cdf8d6f
3 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
BBB_GOFILES/colorbutton.go → colorbutton.go
View File

@ -6,28 +6,7 @@ import (
"unsafe" "unsafe"
) )
// #include <stdlib.h> // #include "pkgui.h"
// #include "ui.h"
// #include "util.h"
// extern void doColorButtonOnChanged(uiColorButton *, void *);
// // see golang/go#19835
// typedef void (*colorButtonCallback)(uiColorButton *, void *);
// typedef struct pkguiCColor pkguiCColor;
// struct pkguiCColor { double *r; double *g; double *b; double *a; };
// static inline pkguiCColor pkguiNewCColor(void)
// {
// pkguiCColor c;
//
// c.r = (double *) pkguiAlloc(4 * sizeof (double));
// c.g = c.r + 1;
// c.b = c.g + 1;
// c.a = c.b + 1;
// return c;
// }
// static inline void pkguiFreeCColor(pkguiCColor c)
// {
// free(c.r);
// }
import "C" import "C"
// ColorButton is a Control that represents a button that the user can // ColorButton is a Control that represents a button that the user can
@ -44,7 +23,7 @@ func NewColorButton() *ColorButton {
b.b = C.uiNewColorButton() b.b = C.uiNewColorButton()
C.uiColorButtonOnChanged(b.b, C.colorButtonCallback(C.doColorButtonOnChanged), nil) C.pkguiColorButtonOnChanged(b.b)
b.ControlBase = NewControlBase(b, uintptr(unsafe.Pointer(b.b))) b.ControlBase = NewControlBase(b, uintptr(unsafe.Pointer(b.b)))
return b return b
@ -54,8 +33,8 @@ func NewColorButton() *ColorButton {
// Colors are not alpha-premultiplied. // Colors are not alpha-premultiplied.
// TODO rename b or bl // TODO rename b or bl
func (b *ColorButton) Color() (r, g, bl, a float64) { func (b *ColorButton) Color() (r, g, bl, a float64) {
c := C.pkguiNewCColor() c := C.pkguiNewColorDoubles()
defer C.pkguiFreeCColor(c) defer C.pkguiFreeColorDoubles(c)
C.uiColorButtonColor(b.b, c.r, c.g, c.b, c.a) C.uiColorButtonColor(b.b, c.r, c.g, c.b, c.a)
return float64(*(c.r)), float64(*(c.g)), float64(*(c.b)), float64(*(c.a)) return float64(*(c.r)), float64(*(c.g)), float64(*(c.b)), float64(*(c.a))
} }
@ -74,8 +53,8 @@ func (b *ColorButton) OnChanged(f func(*ColorButton)) {
b.onChanged = f b.onChanged = f
} }
//export doColorButtonOnChanged //export pkguiDoColorButtonOnChanged
func doColorButtonOnChanged(bb *C.uiColorButton, data unsafe.Pointer) { func pkguiDoColorButtonOnChanged(bb *C.uiColorButton, data unsafe.Pointer) {
b := ControlFromLibui(uintptr(unsafe.Pointer(bb))).(*ColorButton) b := ControlFromLibui(uintptr(unsafe.Pointer(bb))).(*ColorButton)
if b.onChanged != nil { if b.onChanged != nil {
b.onChanged(b) b.onChanged(b)

29
pkgui.c
View File

@ -37,6 +37,35 @@ void pkguiCheckboxOnToggled(uiCheckbox *c)
uiCheckboxOnToggled(c, pkguiDoCheckboxOnToggled, NULL); uiCheckboxOnToggled(c, pkguiDoCheckboxOnToggled, NULL);
} }
void pkguiColorButtonOnChanged(uiColorButton *c)
{
uiColorButtonOnChanged(c, pkguiDoColorButtonOnChanged, NULL);
}
typedef struct pkguiColorDoubles pkguiColorDoubles;
struct pkguiColorDoubles {
double *r;
double *g;
double *b;
double *a;
};
pkguiColorDoubles pkguiAllocColorDoubles(void)
{
pkguiColorDoubles c;
c.r = (double *) pkguiAlloc(4 * sizeof (double));
c.g = c.r + 1;
c.b = c.g + 1;
c.a = c.b + 1;
return c;
}
void pkguiFreeColorDoubles(pkguiColorDoubles c)
{
free(c.r);
}
void pkguiComboboxOnSelected(uiCombobox *c) void pkguiComboboxOnSelected(uiCombobox *c)
{ {
uiComboboxOnSelected(c, pkguiDoComboboxOnSelected, NULL); uiComboboxOnSelected(c, pkguiDoComboboxOnSelected, NULL);

12
pkgui.h
View File

@ -22,6 +22,18 @@ extern void pkguiButtonOnClicked(uiButton *b);
// checkbox.go // checkbox.go
extern void pkguiCheckboxOnToggled(uiCheckbox *c); extern void pkguiCheckboxOnToggled(uiCheckbox *c);
// colorbutton.go
extern void pkguiColorButtonOnChanged(uiColorButton *c);
typedef struct pkguiColorDoubles pkguiColorDoubles;
struct pkguiColorDoubles {
double *r;
double *g;
double *b;
double *a;
};
extern pkguiColorDoubles pkguiAllocColorDoubles(void);
extern void pkguiFreeColorDoubles(pkguiColorDoubles c);
// combobox.go // combobox.go
extern void pkguiComboboxOnSelected(uiCombobox *c); extern void pkguiComboboxOnSelected(uiCombobox *c);