pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

merge conflict

Browse source
This commit is contained in:
IoI_xD 2026-03-30 11:31:40 -07:00
commit 9560c4fd92
20 changed files with 589 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/widget/box.c
View file

@ -21,7 +21,7 @@ static int create(MwWidget handle) {
return 0;
}
static void destroy(MwWidget handle){
static void destroy(MwWidget handle) {
MwBox b = handle->internal;
free(b);
}
@ -78,7 +78,7 @@ static void layout(MwWidget handle) {
static void draw(MwWidget handle) {
MwRect r;
MwLLColor base = MwParseColor(handle, MwGetText(handle, MwNbackground));
MwBox b = handle->internal;
MwBox b = handle->internal;
r.x = 0;
r.y = 0;
@ -93,7 +93,7 @@ static void draw(MwWidget handle) {
MwLLFreeColor(base);
if(b->layout){
if(b->layout) {
layout(handle);
b->layout = 0;
@ -101,8 +101,8 @@ static void draw(MwWidget handle) {
}
static void prop_change(MwWidget handle, const char* key) {
if(strcmp(key, MwNorientation) == 0){
MwBox b = handle->internal;
if(strcmp(key, MwNorientation) == 0) {
MwBox b = handle->internal;
b->layout = 1;
MwForceRender(handle);
@ -112,8 +112,8 @@ static void prop_change(MwWidget handle, const char* key) {
static void children_prop_change(MwWidget handle, MwWidget child, const char* key) {
(void)child;
if(strcmp(key, MwNratio) == 0 || strcmp(key, MwNfixedSize) == 0){
MwBox b = handle->internal;
if(strcmp(key, MwNratio) == 0 || strcmp(key, MwNfixedSize) == 0) {
MwBox b = handle->internal;
b->layout = 1;
MwForceRender(handle);
@ -121,14 +121,14 @@ static void children_prop_change(MwWidget handle, MwWidget child, const char* ke
}
static void resize(MwWidget handle) {
MwBox b = handle->internal;
MwBox b = handle->internal;
b->layout = 1;
MwForceRender(handle);
}
static void children_update(MwWidget handle) {
MwBox b = handle->internal;
MwBox b = handle->internal;
b->layout = 1;
MwForceRender(handle);

4
src/widget/opengl.c
View file

@ -316,6 +316,7 @@ static int create(MwWidget handle) {
if(!eglMakeCurrent(display, surface, surface, context)) {
printf("ERROR: eglMakeCurrent (setup): %0X\n", eglGetError());
}
eglSwapInterval(o->egl_display, 0);
o->egl_display = display;
o->egl_surface = surface;
@ -425,8 +426,6 @@ static void mwOpenGLMakeCurrentImpl(MwWidget handle) {
o->egl_context)) {
printf("ERROR: eglMakeCurrent, %0X\n", eglGetError());
}
eglSwapInterval(o->egl_display, 1);
}
#endif
}
@ -450,6 +449,7 @@ static void mwOpenGLSwapBufferImpl(MwWidget handle) {
#ifdef USE_WAYLAND
if(handle->lowlevel->common.type == MwLLBackendWayland) {
waylandopengl_t* o = handle->internal;
eglSwapInterval(o->egl_display, 0);
if(!eglSwapBuffers(o->egl_display, o->egl_surface)) {
printf("ERROR: eglSwapBuffers, %0X\n", eglGetError());
};