diff options
Diffstat (limited to 'libdecor/src')
| -rw-r--r-- | libdecor/src/libdecor-plugin.h | 20 | ||||
| -rw-r--r-- | libdecor/src/libdecor.c | 34 | ||||
| -rw-r--r-- | libdecor/src/libdecor.h | 28 |
3 files changed, 41 insertions, 41 deletions
diff --git a/libdecor/src/libdecor-plugin.h b/libdecor/src/libdecor-plugin.h index eba41d409..e91ee2b00 100644 --- a/libdecor/src/libdecor-plugin.h +++ b/libdecor/src/libdecor-plugin.h @@ -160,10 +160,10 @@ libdecor_notify_plugin_error(struct libdecor *context, ...); int -libdecor_state_get_content_width (struct libdecor_state *state); +libdecor_state_get_content_width(struct libdecor_state *state); int -libdecor_state_get_content_height (struct libdecor_state *state); +libdecor_state_get_content_height(struct libdecor_state *state); enum libdecor_window_state libdecor_state_get_window_state(struct libdecor_state *state); @@ -176,20 +176,4 @@ libdecor_plugin_init(struct libdecor_plugin *plugin, void libdecor_plugin_release(struct libdecor_plugin *plugin); -/* - * Get the min content size as set before with libdecor_frame_set_min_content_size(). - */ -void -libdecor_frame_get_min_content_size(struct libdecor_frame *frame, - int *pcontent_width, - int *pcontent_height); - -/* - * Get the max content size as set before with libdecor_frame_set_max_content_size(). - */ -void -libdecor_frame_get_max_content_size(struct libdecor_frame *frame, - int *pcontent_width, - int *pcontent_height); - #endif /* LIBDECOR_PLUGIN_H */ 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) diff --git a/libdecor/src/libdecor.h b/libdecor/src/libdecor.h index 214a10c4e..d3ccea181 100644 --- a/libdecor/src/libdecor.h +++ b/libdecor/src/libdecor.h @@ -347,26 +347,42 @@ libdecor_frame_translate_coordinate(struct libdecor_frame *frame, int *frame_y); /** - * Set the max content size. + * Set the min content size. * - * This translates roughly to xdg_toplevel_set_max_size(). + * This translates roughly to xdg_toplevel_set_min_size(). */ 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); /** - * Set the min content size. + * Set the max content size. * - * This translates roughly to xdg_toplevel_set_min_size(). + * This translates roughly to xdg_toplevel_set_max_size(). */ 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); /** + * Get the min content size. + */ +void +libdecor_frame_get_min_content_size(const struct libdecor_frame *frame, + int *content_width, + int *content_height); + +/** + * Get the max content size. + */ +void +libdecor_frame_get_max_content_size(const struct libdecor_frame *frame, + int *content_width, + int *content_height); + +/** * Initiate an interactive resize. * * This roughly translates to xdg_toplevel_resize(). |