X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ffont_size.h;h=4f49eb73505ae4ab7ef36932173bfa3af31c3b84;hb=04ae4d393603da286d78a72c4f60c545c03b35e8;hp=6f4f8a52ace530b18c361436bf8029af3fe0a2c1;hpb=5f16353ba149de47e916f02b149b719c34ac3d30;p=libsub.git diff --git a/src/font_size.h b/src/font_size.h index 6f4f8a5..4f49eb7 100644 --- a/src/font_size.h +++ b/src/font_size.h @@ -36,7 +36,7 @@ public: void set_proportional (float p) { _proportional = p; } - + void set_points (int p) { _points = p; } @@ -44,20 +44,25 @@ public: boost::optional proportional () const { return _proportional; } - + boost::optional points () const { return _points; } - + + bool specified () const; + float proportional (int screen_height_in_points) const; int points (int screen_height_in_points) const; - -private: + + static FontSize from_points (int p); + static FontSize from_proportional (float p); + +private: /** as a proportion of screen height */ boost::optional _proportional; /** in points */ boost::optional _points; - + }; }