diff --git a/config/schema/image_effects.schema.yml b/config/schema/image_effects.schema.yml index e0bc397..18b1d84 100644 --- a/config/schema/image_effects.schema.yml +++ b/config/schema/image_effects.schema.yml @@ -119,9 +119,9 @@ image.effect.image_effects_set_canvas: type: mapping label: 'Set canvas image effect' mapping: - canvas_mode: + canvas_size: type: string - label: 'Canvas sizing mode, exact or relative' + label: 'Canvas sizing, exact or relative' canvas_color: type: string label: 'RGBA color of the canvas' diff --git a/src/Plugin/ImageEffect/SetCanvasImageEffect.php b/src/Plugin/ImageEffect/SetCanvasImageEffect.php index a6dc24e..e32575d 100644 --- a/src/Plugin/ImageEffect/SetCanvasImageEffect.php +++ b/src/Plugin/ImageEffect/SetCanvasImageEffect.php @@ -29,7 +29,7 @@ class SetCanvasImageEffect extends ConfigurableImageEffectBase { */ public function defaultConfiguration() { return NestedArray::mergeDeep([ - 'canvas_mode' => 'exact', + 'canvas_size' => 'exact', 'canvas_color' => NULL, 'exact' => [ 'width' => '', @@ -70,10 +70,10 @@ class SetCanvasImageEffect extends ConfigurableImageEffectBase { * {@inheritdoc} */ public function buildConfigurationForm(array $form, FormStateInterface $form_state) { - $form['canvas_mode'] = [ + $form['canvas_size'] = [ '#type' => 'radios', - '#title' => $this->t('Canvas mode'), - '#default_value' => $this->configuration['canvas_mode'], + '#title' => $this->t('Canvas size'), + '#default_value' => $this->configuration['canvas_size'], '#options' => [ 'exact' => $this->t('Exact size'), 'relative' => $this->t('Relative size'), @@ -90,7 +90,7 @@ class SetCanvasImageEffect extends ConfigurableImageEffectBase { '#collapsible' => FALSE, '#states' => [ 'visible' => [ - ':input[name="data[canvas_mode]"]' => ['value' => 'exact'], + ':input[name="data[canvas_size]"]' => ['value' => 'exact'], ], ], ]; @@ -154,7 +154,7 @@ class SetCanvasImageEffect extends ConfigurableImageEffectBase { '#collapsible' => FALSE, '#states' => [ 'visible' => [ - ':input[name="data[canvas_mode]"]' => ['value' => 'relative'], + ':input[name="data[canvas_size]"]' => ['value' => 'relative'], ], ], ]; @@ -232,7 +232,7 @@ class SetCanvasImageEffect extends ConfigurableImageEffectBase { $data['height'] = $dimensions['height']; // Get offset of original image. - if ($this->configuration['canvas_mode'] === 'exact') { + if ($this->configuration['canvas_size'] === 'exact') { list($x_pos, $y_pos) = explode('-', $this->configuration['exact']['placement']); $data['x_pos'] = image_filter_keyword($x_pos, $data['width'], $image->getWidth()) + $this->configuration['exact']['x_offset']; $data['y_pos'] = image_filter_keyword($y_pos, $data['height'], $image->getHeight()) + $this->configuration['exact']['y_offset']; @@ -273,7 +273,7 @@ class SetCanvasImageEffect extends ConfigurableImageEffectBase { */ protected function getDimensions($source_width, $source_height) { $dimensions = []; - if ($this->configuration['canvas_mode'] === 'exact') { + if ($this->configuration['canvas_size'] === 'exact') { // Exact size. $tmp_width = $this->configuration['exact']['width'] ?: $source_width; $tmp_height = $this->configuration['exact']['height'] ?: $source_height; diff --git a/src/Tests/ImageEffectsSetCanvasTest.php b/src/Tests/ImageEffectsSetCanvasTest.php index 54c4e06..3a5157a 100644 --- a/src/Tests/ImageEffectsSetCanvasTest.php +++ b/src/Tests/ImageEffectsSetCanvasTest.php @@ -46,7 +46,7 @@ class ImageEffectsSetCanvasTest extends ImageEffectsTestBase { $effect = [ 'id' => 'image_effects_set_canvas', 'data' => [ - 'canvas_mode' => 'exact', + 'canvas_size' => 'exact', 'canvas_color][container][transparent' => FALSE, 'canvas_color][container][hex' => '#FF00FF', 'canvas_color][container][opacity' => 100, @@ -90,7 +90,7 @@ class ImageEffectsSetCanvasTest extends ImageEffectsTestBase { $effect = [ 'id' => 'image_effects_set_canvas', 'data' => [ - 'canvas_mode' => 'relative', + 'canvas_size' => 'relative', 'canvas_color][container][transparent' => FALSE, 'canvas_color][container][hex' => '#FFFF00', 'canvas_color][container][opacity' => 100, diff --git a/templates/image-effects-set-canvas-summary.html.twig b/templates/image-effects-set-canvas-summary.html.twig index 8beecd9..c1b5693 100644 --- a/templates/image-effects-set-canvas-summary.html.twig +++ b/templates/image-effects-set-canvas-summary.html.twig @@ -6,7 +6,7 @@ * Available variables: * - data: The current configuration for this set canvas effect, including: * - canvas_color: The canvas color in RGBA format. - * - canvas_mode: 'exact' or 'relative'. + * - canvas_size: 'exact' or 'relative'. * - exact: The configuration for exact size, including: * - width: the width in px or as % of source image. * - height: the height in px or as % of source image. @@ -29,13 +29,13 @@ */ #} {% spaceless %} -{% if data.canvas_mode == 'exact' %} +{% if data.canvas_size == 'exact' %} - {{ 'Exact size'|t }}: {% if data.exact.width %}{{ data.exact.width|e }}{% else %}{{ '100%'|t }}{% endif %}x{% if data.exact.height %}{{ data.exact.height|e }}{% else %}{{ '100%'|t }}{% endif %} {{ 'Placement'|t }}: {{ data.exact.placement|e }} {% if data.exact.x_offset %} {{ 'X offset'|t }}: {{ data.exact.x_offset|e }}px{% endif %} {% if data.exact.y_offset %} {{ 'Y offset'|t }}: {{ data.exact.y_offset|e }}px{% endif %} -{% elseif data.canvas_mode == 'relative' %} +{% elseif data.canvas_size == 'relative' %} - {{ 'Relative size'|t }}: {% if data.relative.left %} {{ 'left'|t }}: {{ data.relative.left|e }}px{% endif %} {% if data.relative.right %} {{ 'right'|t }}: {{ data.relative.right|e }}px{% endif %}