interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reimplemented GTK+ uiProgressBar and uiSpinbox.

This commit is contained in:
Pietro Gagliardi 2015-07-01 11:21:06 -04:00
parent 92aaa1ae07
commit 7ce9a8c277
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redo/unix/progressbar.c
View File

@ -22,7 +22,7 @@ static void progressbarSetValue(uiProgressBar *pp, int value)
if (value < 0 || value > 100) if (value < 0 || value > 100)
complain("value %d out of range in progressbarSetValue()", value); complain("value %d out of range in progressbarSetValue()", value);
PUT_CODE_HERE; gtk_progress_bar_set_fraction(p->pbar, ((gdouble) value) / 100);
} }
uiProgressBar *uiNewProgressBar(void) uiProgressBar *uiNewProgressBar(void)

14
redo/unix/spinbox.c
View File

@ -12,6 +12,13 @@ struct spinbox {
uiDefineControlType(uiSpinbox, uiTypeSpinbox, struct spinbox) uiDefineControlType(uiSpinbox, uiTypeSpinbox, struct spinbox)
static void onChanged(GtkSpinButton *sb, gpointer data)
{
struct spinbox *s = (struct spinbox *) data;
(*(s->onChanged))(uiSpinbox(s), s->onChangedData);
}
static uintptr_t spinboxHandle(uiControl *c) static uintptr_t spinboxHandle(uiControl *c)
{ {
struct spinbox *s = (struct spinbox *) c; struct spinbox *s = (struct spinbox *) c;
@ -28,14 +35,16 @@ static intmax_t spinboxValue(uiSpinbox *ss)
{ {
struct spinbox *s = (struct spinbox *) ss; struct spinbox *s = (struct spinbox *) ss;
return PUT_CODE_HERE; return (intmax_t) gtk_spin_button_get_value(s->spinButton);
} }
static void spinboxSetValue(uiSpinbox *ss, intmax_t value) static void spinboxSetValue(uiSpinbox *ss, intmax_t value)
{ {
struct spinbox *s = (struct spinbox *) ss; struct spinbox *s = (struct spinbox *) ss;
PUT_CODE_HERE; // TODO does this raise an event?
// TODO does this clamp?
gtk_spin_button_set_value(s->spinButton, (gdouble) value);
} }
static void spinboxOnChanged(uiSpinbox *ss, void (*f)(uiSpinbox *, void *), void *data) static void spinboxOnChanged(uiSpinbox *ss, void (*f)(uiSpinbox *, void *), void *data)
@ -63,6 +72,7 @@ uiSpinbox *uiNewSpinbox(intmax_t min, intmax_t max)
// TODO needed? // TODO needed?
gtk_spin_button_set_digits(s->spinButton, 0); gtk_spin_button_set_digits(s->spinButton, 0);
g_signal_connect(s->spinButton, "value-changed", G_CALLBACK(onChanged), s);
s->onChanged = defaultOnChanged; s->onChanged = defaultOnChanged;
uiControl(s)->Handle = spinboxHandle; uiControl(s)->Handle = spinboxHandle;