diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-19 16:25:34 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-19 16:25:34 +0200 |
| commit | 08d469c9ea5a5bdf186a4aa11f003affac1962e4 (patch) | |
| tree | 52ec76e484c8c747e6b8d6cabaa4bb5c80536d68 /src/themes/theme.vala | |
| parent | 601eaec7bdaf999574df69c41e41a1383921580b (diff) | |
| parent | 10af7615316fd91eef61cc66a8ede38a2bff3fdc (diff) | |
Merge tag 'upstream/0.6.5'
Upstream version 0.6.5
Diffstat (limited to 'src/themes/theme.vala')
| -rw-r--r-- | src/themes/theme.vala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/themes/theme.vala b/src/themes/theme.vala index e068b9e..a7dd4f8 100644 --- a/src/themes/theme.vala +++ b/src/themes/theme.vala @@ -486,17 +486,17 @@ public class Theme : GLib.Object { this.visible_slice_radius = Math.fmax(slice_radius*scale, this.visible_slice_radius); if (slice->name.down() == "activeslice") { - if (type == SliceLayer.Type.ICON) active_slice_layers.add(new SliceLayer.icon(file, size, colorize, visibility)); + if (type == SliceLayer.Type.ICON) active_slice_layers.add(new SliceLayer.icon(file, size, pos_x, pos_y, colorize, visibility)); else if (type == SliceLayer.Type.CAPTION) active_slice_layers.add(new SliceLayer.caption(slice_caption_font, slice_caption_width, slice_caption_height, - pos_y, slice_caption_color, colorize, visibility)); - else active_slice_layers.add(new SliceLayer.file(file, size, colorize, visibility)); + pos_x, pos_y, slice_caption_color, colorize, visibility)); + else active_slice_layers.add(new SliceLayer.file(file, size, pos_x, pos_y, colorize, visibility)); } else { - if (type == SliceLayer.Type.ICON) inactive_slice_layers.add(new SliceLayer.icon(file, size, colorize, visibility)); + if (type == SliceLayer.Type.ICON) inactive_slice_layers.add(new SliceLayer.icon(file, size, pos_x, pos_y, colorize, visibility)); else if (type == SliceLayer.Type.CAPTION) inactive_slice_layers.add(new SliceLayer.caption(slice_caption_font, slice_caption_width, slice_caption_height, - pos_y, slice_caption_color, colorize, visibility)); - else inactive_slice_layers.add(new SliceLayer.file(file, size, colorize, visibility)); + pos_x, pos_y, slice_caption_color, colorize, visibility)); + else inactive_slice_layers.add(new SliceLayer.file(file, size, pos_x, pos_y, colorize, visibility)); } } else { |