diff options
Diffstat (limited to 'src/common/surface.c')
| -rw-r--r-- | src/common/surface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/surface.c b/src/common/surface.c index 9b4a8ad..b47fea7 100644 --- a/src/common/surface.c +++ b/src/common/surface.c @@ -119,7 +119,7 @@ yasl_surface *yasl_surface_create(const char *title,int width,int height,unsigne if(!creation_valid(width,height,flags)) return NULL; bool fresh=!display; if(!initialize()) return NULL; - struct yasl_private_window_spec spec={.title=title,.size_logical={width,height}, + struct yasl_private_window_spec spec={.title=title,.size={width,height}, .flags=flags,.external_gpu=!(flags&YASL_SURFACE_CPU)}; yasl_surface *s=yasl_private_surface_create_toplevel(display,&spec); if(!s) { @@ -446,7 +446,7 @@ static bool trigger_valid(yasl_surface *s,const yasl_event *e) static bool popup_spec(yasl_surface *s,int w,int h,double x,double y,double aw,double ah,enum yasl_popup_edge anchor,enum yasl_popup_edge gravity,unsigned constraints,struct yasl_private_popup_spec *out) { if(w<=0||h<=0 || (unsigned)anchor>8 || (unsigned)gravity>8 || (constraints&~63u))return yasl_public_fail(EINVAL); - *out=(struct yasl_private_popup_spec){.size={yasl_private_scale_to_device(w,s->scale_120),yasl_private_scale_to_device(h,s->scale_120)},.anchor_edges=anchor,.gravity=gravity,.constraints=constraints,.positioner_explicit=true}; + *out=(struct yasl_private_popup_spec){.size={yasl_private_scale_to_device(w,s->scale_120),yasl_private_scale_to_device(h,s->scale_120)},.anchor_edges=anchor,.gravity=gravity,.constraints=constraints}; return logical_rect(s,x,y,aw,ah,&out->anchor); } yasl_surface *yasl_popup_create(yasl_surface *parent,int w,int h,double x,double y,double aw,double ah,enum yasl_popup_edge anchor,enum yasl_popup_edge gravity,unsigned constraints,const yasl_event *trigger) @@ -494,7 +494,7 @@ yasl_surface *yasl_gl_surface_create(const char *title,int w,int h,unsigned flag bool fresh=!display;if(!initialize())return NULL; if(share && (share->display!=display || share->presenter!=YASL_PRIVATE_PRESENTER_GL)) {yasl_public_fail(EINVAL);return NULL;} if(!display->ops->surface_create_gl) {if(fresh)yasl_shutdown();yasl_public_fail(ENOTSUP);return NULL;} - struct yasl_private_window_spec spec={.title=title,.size_logical={w,h},.flags=flags,.external_gpu=true}; + struct yasl_private_window_spec spec={.title=title,.size={w,h},.flags=flags,.external_gpu=true}; yasl_surface *s=display->ops->surface_create_gl(display,&spec,attrs,share); if(!s){int error=errno;if(fresh)yasl_shutdown();yasl_public_fail(error);return NULL;} if(!yasl_private_events_register(s)){int error=errno;display->ops->surface_destroy(s);if(fresh)yasl_shutdown();yasl_public_fail(error);return NULL;} |