Changeset 582 for sweep

Show
Ignore:
Timestamp:
07/07/08 15:17:28 (6 months ago)
Author:
kickback
Message:

sweep-unstable: better schemes window sizing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/branches/sweep-unstable/src/schemes.c

    r581 r582  
    10981098  sw_view   * view; 
    10991099  GList     * element; 
    1100   gint        index; 
     1100  gint        index, width, height; 
     1101  GdkScreen * screen; 
    11011102   
    11021103  if (window == NULL) { 
    1103        
     1104      
     1105    screen = gdk_screen_get_default (); 
     1106    height = gdk_screen_get_height (screen); 
     1107    width  = gdk_screen_get_width (screen); 
     1108      
    11041109    view = (sw_view *)user_data; 
    11051110    window = gtk_window_new (GTK_WINDOW_TOPLEVEL); 
    …… 
    11091114     
    11101115    gtk_window_set_title (GTK_WINDOW (window), _("Sweep: Color Scheme Options")); 
    1111     gtk_widget_set_size_request (window, 620, -1); 
     1116    gtk_window_set_default_size (GTK_WINDOW (window), 
     1117                                 MIN (750, width),  
     1118                                 MIN (450, width)); 
    11121119   
    11131120     
    …… 
    12291236  elements_store = gtk_list_store_new (N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_INT); 
    12301237  treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (elements_store)); 
    1231    
     1238 
    12321239  renderer = gtk_cell_renderer_pixbuf_new (); 
    12331240   
    …… 
    14331440     
    14341441  /* color swatches treeview */ 
    1435  
     1442         
    14361443  frame = gtk_frame_new (NULL); 
    14371444  gtk_container_set_border_width (GTK_CONTAINER (frame), 0); 
    14381445  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); 
    14391446  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 2); 
    1440      
     1447 
    14411448  treeview = schemes_create_tree_view (); 
    1442   gtk_container_add (GTK_CONTAINER (frame), treeview); 
     1449 
    14431450  gtk_tooltips_set_tip (tooltips, treeview,  
    14441451                          _("Select an element to edit it"), 
    1445                           _("Select an element to edit it")); 
    1446    
     1452                          _("Select an element to edit it"));    
     1453  GtkScrolledWindow *scrolled_window; 
     1454  scrolled_window = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL,NULL)); 
     1455  gtk_scrolled_window_set_policy (scrolled_window, GTK_POLICY_NEVER, 
     1456                                  GTK_POLICY_AUTOMATIC); 
     1457  gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (treeview)); 
     1458   
     1459  gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (scrolled_window));  
     1460     
    14471461  /* color selection */   
    14481462