diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-05-27 10:58:23 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-05-27 10:58:23 +0200 |
| commit | 5afd0bb44aa3fff79fd7825e9ac97f991d3d1f39 (patch) | |
| tree | 74c293e5e43e5422fe193b02d9766b1cf40bb570 /libdecor/src/libdecor.c | |
| parent | b78035624d5135f27b9742249652f124411f90a9 (diff) | |
libdecor: pull upstream changes (a382710b on 28 apr 2022).
Diffstat (limited to 'libdecor/src/libdecor.c')
| -rw-r--r-- | libdecor/src/libdecor.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libdecor/src/libdecor.c b/libdecor/src/libdecor.c index 9fedf1a35..c4b5b1e99 100644 --- a/libdecor/src/libdecor.c +++ b/libdecor/src/libdecor.c @@ -839,47 +839,47 @@ libdecor_frame_translate_coordinate(struct libdecor_frame *frame, } LIBDECOR_EXPORT void -libdecor_frame_set_max_content_size(struct libdecor_frame *frame, +libdecor_frame_set_min_content_size(struct libdecor_frame *frame, int content_width, int content_height) { struct libdecor_frame_private *frame_priv = frame->priv; - frame_priv->state.content_limits.max_width = content_width; - frame_priv->state.content_limits.max_height = content_height; + frame_priv->state.content_limits.min_width = content_width; + frame_priv->state.content_limits.min_height = content_height; } LIBDECOR_EXPORT void -libdecor_frame_set_min_content_size(struct libdecor_frame *frame, +libdecor_frame_set_max_content_size(struct libdecor_frame *frame, int content_width, int content_height) { struct libdecor_frame_private *frame_priv = frame->priv; - frame_priv->state.content_limits.min_width = content_width; - frame_priv->state.content_limits.min_height = content_height; + frame_priv->state.content_limits.max_width = content_width; + frame_priv->state.content_limits.max_height = content_height; } LIBDECOR_EXPORT void -libdecor_frame_get_min_content_size(struct libdecor_frame *frame, - int *pcontent_width, - int *pcontent_height) +libdecor_frame_get_min_content_size(const struct libdecor_frame *frame, + int *content_width, + int *content_height) { struct libdecor_frame_private *frame_priv = frame->priv; - *pcontent_width = frame_priv->state.content_limits.min_width; - *pcontent_height = frame_priv->state.content_limits.min_height; + *content_width = frame_priv->state.content_limits.min_width; + *content_height = frame_priv->state.content_limits.min_height; } LIBDECOR_EXPORT void -libdecor_frame_get_max_content_size(struct libdecor_frame *frame, - int *pcontent_width, - int *pcontent_height) +libdecor_frame_get_max_content_size(const struct libdecor_frame *frame, + int *content_width, + int *content_height) { struct libdecor_frame_private *frame_priv = frame->priv; - *pcontent_width = frame_priv->state.content_limits.max_width; - *pcontent_height = frame_priv->state.content_limits.max_height; + *content_width = frame_priv->state.content_limits.max_width; + *content_height = frame_priv->state.content_limits.max_height; } LIBDECOR_EXPORT enum libdecor_capabilities @@ -1495,7 +1495,7 @@ init_plugins(struct libdecor *context) if (!de) break; - plugin_loader = load_plugin_loader(context, + plugin_loader = load_plugin_loader(context, plugin_dir, de->d_name); if (!plugin_loader) |