Changeset 114

Timestamp:

06/11/13 19:25:36 (12 years ago)

Author:

epyon

Message:

• texture_font - fixes
• gui_style - fixes
• position - added missing accessors and expand/shrink

Location:

trunk

Files:

• nv/position.hh (modified) (2 diffs)
• src/gfx/texture_font.cc (modified) (1 diff)
• src/gui/gui_style.cc (modified) (3 diffs)

trunk/nv/position.hh

@@ -102 +102 @@
                 void set_position( position p ) { lr = p + (lr - ul); ul = p; }
 
+                position ur() const { return position( lr.x, ul.y ); }
+                position ll() const { return position( ul.x, lr.y ); }
                 /**
                  *Gets the dimensions of the rectangle.  Synonym for get_size.
@@ -159 +161 @@
                  */
                 bool is_valid() const { return x2 >= x1 && y2 >= y1; }
+                void expand( value_type value ) { position p(value,value); ul -= p; lr += p; }
+                void shrink( value_type value ) { position p(value,value); ul += p; lr -= p; }
+                rectangle expanded( int value ) { position p(value,value); return rectangle(ul-p, lr+p); }
+                rectangle shrinked( int value ) { position p(value,value); return rectangle(ul+p, lr-p); }
                 
                 /**

trunk/src/gfx/texture_font.cc

@@ -28 +28 @@
         m_hinting( true ), m_filtering( true ), m_rlibrary( nullptr ), m_rface( nullptr )
 {
+        load_freetype_library();
         size_t hres = 64;
         FT_Error error;

trunk/src/gui/gui_style.cc

@@ -74 +74 @@
         // check id
         lua_getfield( m_lua, -1, cid );
-        if ( !lua_istable( m_lua, -1 ) )
+        if ( lua_istable( m_lua, -1 ) )
         {
                 lua_getfield( m_lua, -1, centry );
@@ -83 +83 @@
         // check class
         lua_getfield( m_lua, -1, cclass );
-        if ( !lua_istable( m_lua, -1 ) )
+        if ( lua_istable( m_lua, -1 ) )
         {
                 lua_getfield( m_lua, -1, centry );
@@ -91 +91 @@
 
         // check entry
-        lua_getfield( m_lua, -1, cclass );
+        lua_getfield( m_lua, -1, centry );
         if ( lua_type( m_lua, -1 ) == type ) return true;
         return false;