Skip to content
This repository has been archived by the owner on Mar 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #144 from ricotz/master
Browse files Browse the repository at this point in the history
fix invalid chainup discovered by valac 0.35.x
  • Loading branch information
Schneegans committed Feb 22, 2017
2 parents 9667575 + f0e3213 commit c83e099
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/utilities/color.vala
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ public class Color: GLib.Object {
/////////////////////////////////////////////////////////////////////

public Color() {
Color.from_rgb(1.0f, 1.0f, 1.0f);
this.from_rgb(1.0f, 1.0f, 1.0f);
}

/////////////////////////////////////////////////////////////////////
/// Creates a solid color with the given RGB values.
/////////////////////////////////////////////////////////////////////

public Color.from_rgb(float red, float green, float blue) {
Color.from_rgba(red, green, blue, 1.0f);
this.from_rgba(red, green, blue, 1.0f);
}

/////////////////////////////////////////////////////////////////////
Expand All @@ -68,7 +68,7 @@ public class Color: GLib.Object {
/////////////////////////////////////////////////////////////////////

public Color.from_gdk(Gdk.RGBA color) {
Color.from_rgba(
this.from_rgba(
(float)color.red,
(float)color.green,
(float)color.blue,
Expand All @@ -86,7 +86,7 @@ public class Color: GLib.Object {
if (!ctx.lookup_color(style_name, out color)) {
warning("Failed to get style color for widget style \"" + style_name + "\"!");
}
Color.from_gdk(color);
this.from_gdk(color);
}

/////////////////////////////////////////////////////////////////////
Expand All @@ -96,7 +96,7 @@ public class Color: GLib.Object {
public Color.from_string(string hex_string) {
var color = Gdk.RGBA();
color.parse(hex_string);
Color.from_gdk(color);
this.from_gdk(color);
}

/////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -134,7 +134,7 @@ public class Color: GLib.Object {
}
}

Color.from_rgb((float)(rtotal/total), (float)(gtotal/total), (float)(btotal/total));
this.from_rgb((float)(rtotal/total), (float)(gtotal/total), (float)(btotal/total));

if (s > 0.15f) s = 0.65f;

Expand Down

0 comments on commit c83e099

Please sign in to comment.