comparison src/aosd/aosd_osd.c @ 2253:e253d4b1849b

branch merge
author Cristi Magherusan <majeru@atheme-project.org>
date Wed, 19 Dec 2007 17:25:55 +0200
parents e7cbef69e9e0
children
comparison
equal deleted inserted replaced
2249:a95b6a94682d 2253:e253d4b1849b
177 177
178 static void 178 static void
179 aosd_osd_create ( void ) 179 aosd_osd_create ( void )
180 { 180 {
181 gint max_width, layout_width, layout_height; 181 gint max_width, layout_width, layout_height;
182 PangoRectangle ink; 182 PangoRectangle ink, log;
183 GdkScreen *screen = gdk_screen_get_default(); 183 GdkScreen *screen = gdk_screen_get_default();
184 gint pos_x = 0, pos_y = 0; 184 gint pos_x = 0, pos_y = 0;
185 gint pad_left = 0 , pad_right = 0 , pad_top = 0 , pad_bottom = 0; 185 gint pad_left = 0 , pad_right = 0 , pad_top = 0 , pad_bottom = 0;
186 gint screen_width, screen_height; 186 gint screen_width, screen_height;
187 aosd_deco_style_data_t style_data; 187 aosd_deco_style_data_t style_data;
227 osd_data->pango_layout = pango_layout_new(osd_data->pango_context); 227 osd_data->pango_layout = pango_layout_new(osd_data->pango_context);
228 pango_layout_set_markup( osd_data->pango_layout, osd_data->markup_message , -1 ); 228 pango_layout_set_markup( osd_data->pango_layout, osd_data->markup_message , -1 );
229 pango_layout_set_ellipsize( osd_data->pango_layout , PANGO_ELLIPSIZE_NONE ); 229 pango_layout_set_ellipsize( osd_data->pango_layout , PANGO_ELLIPSIZE_NONE );
230 pango_layout_set_justify( osd_data->pango_layout , FALSE ); 230 pango_layout_set_justify( osd_data->pango_layout , FALSE );
231 pango_layout_set_width( osd_data->pango_layout , PANGO_SCALE * max_width ); 231 pango_layout_set_width( osd_data->pango_layout , PANGO_SCALE * max_width );
232 pango_layout_get_pixel_extents( osd_data->pango_layout , &ink , NULL ); 232 pango_layout_get_pixel_extents( osd_data->pango_layout , &ink , &log );
233 layout_width = ink.x + ink.width; 233 layout_width = ink.width;
234 layout_height = ink.y + ink.height; 234 layout_height = log.height;
235 235
236 /* osd position */ 236 /* osd position */
237 switch ( osd_data->cfg_osd->position.placement ) 237 switch ( osd_data->cfg_osd->position.placement )
238 { 238 {
239 case AOSD_POSITION_PLACEMENT_TOP: 239 case AOSD_POSITION_PLACEMENT_TOP: