X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.h;h=cb99cedecb8d6198e89bc869c633eb9a07d55f22;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=8c8c9897335caa0fd55ea79666c2f78de1a73db0;hpb=56c41b294aa47a38ac3e1be70d4868f260cb4274;p=libs%2Fgltk.git diff --git a/source/geometry.h b/source/geometry.h index 8c8c989..cb99ced 100644 --- a/source/geometry.h +++ b/source/geometry.h @@ -12,11 +12,14 @@ Specifies the position and size of a widget or graphic. */ struct MSPGLTK_API Geometry { - int x, y; - unsigned w, h; + int x = 0; + int y = 0; + unsigned w = 1; + unsigned h = 1; - Geometry(): x(0), y(0), w(1), h(1) { } + Geometry() = default; Geometry(int x_, int y_, unsigned w_, unsigned h_): x(x_), y(y_), w(w_), h(h_) { } + bool is_inside(int, int) const; bool is_inside_relative(int, int) const; }; @@ -36,12 +39,12 @@ struct MSPGLTK_API Sides void vertical(unsigned); }; - unsigned top; - unsigned right; - unsigned bottom; - unsigned left; + unsigned top = 0; + unsigned right = 0; + unsigned bottom = 0; + unsigned left = 0; - Sides(); + Sides() = default; Sides(unsigned); Sides(unsigned, unsigned); Sides(unsigned, unsigned, unsigned); @@ -54,10 +57,11 @@ Performs alignment of nested geometries, such as widgets and their parts. */ struct MSPGLTK_API Alignment { - float x, y; - float w, h; + float x = 0.0f; + float y = 0.0f; + float w = 1.0f; + float h = 1.0f; - Alignment(): x(0), y(0), w(1), h(1) { } void apply(Geometry &, const Geometry &) const; void apply(Geometry &, const Geometry &, const Sides &) const; };