diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-19 16:25:31 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-19 16:25:31 +0200 |
| commit | 10af7615316fd91eef61cc66a8ede38a2bff3fdc (patch) | |
| tree | 0f5731b91e14dc14f0ba6f3394768222f66a31be /src/themes | |
| parent | 0b56dfbf01171226a0bb035afcd13358b6477710 (diff) | |
Imported Upstream version 0.6.5upstream/0.6.5
Diffstat (limited to 'src/themes')
| -rw-r--r-- | src/themes/sliceLayer.vala | 16 | ||||
| -rw-r--r-- | src/themes/theme.vala | 12 |
2 files changed, 17 insertions, 11 deletions
diff --git a/src/themes/sliceLayer.vala b/src/themes/sliceLayer.vala index 17ac3bb..bd9e98b 100644 --- a/src/themes/sliceLayer.vala +++ b/src/themes/sliceLayer.vala @@ -48,35 +48,41 @@ public class SliceLayer : GLib.Object { public string font {get; private set; default="";} public int width {get; private set; default=0;} public int height {get; private set; default=0;} - public int position {get; private set; default=0;} + public int x {get; private set; default=0;} + public int y {get; private set; default=0;} public Color color {get; private set; default=new Color();} ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members of the layer. ///////////////////////////////////////////////////////////////////// - public SliceLayer.file(string icon_file, int icon_size, bool colorize, Visibility visibility) { + public SliceLayer.file(string icon_file, int icon_size, int x, int y, bool colorize, Visibility visibility) { this.layer_type = Type.FILE; this.icon_file = icon_file; this.colorize = colorize; this.icon_size = icon_size; + this.x = x; + this.y = y; this.visibility = visibility; } - public SliceLayer.icon(string icon_file, int icon_size, bool colorize, Visibility visibility) { + public SliceLayer.icon(string icon_file, int icon_size, int x, int y, bool colorize, Visibility visibility) { this.layer_type = Type.ICON; this.icon_file = icon_file; this.colorize = colorize; this.icon_size = icon_size; + this.x = x; + this.y = y; this.visibility = visibility; } - public SliceLayer.caption(string font, int width, int height, int position, Color color, bool colorize, Visibility visibility) { + public SliceLayer.caption(string font, int width, int height, int x, int y, Color color, bool colorize, Visibility visibility) { this.layer_type = Type.CAPTION; this.font = font; this.width = width; this.height = height; - this.position = position; + this.x = x; + this.y = y; this.color = color; this.visibility = visibility; this.colorize = colorize; 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 { |