Skip to content

Commit 6cc625c

Browse files
jcupittjcupitt
committed
up to toolview.c
1 parent 1f35c8d commit 6cc625c

14 files changed

+105
-87
lines changed

‎src/defbrowser.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ defbrowser_init( Defbrowser *defbrowser )
221221
defbrowser );
222222
gtk_box_pack_end( GTK_BOX( defbrowser->top ),
223223
defbrowser->entry, FALSE, FALSE, 2 );
224-
label = gtk_image_new_from_icon_name( GTK_STOCK_FIND, GTK_ICON_SIZE_MENU );
224+
label = gtk_image_new_from_icon_name( "find", GTK_ICON_SIZE_MENU );
225225
gtk_box_pack_end( GTK_BOX( defbrowser->top ),
226226
label, FALSE, FALSE, 0 );
227227
gtk_box_pack_start( GTK_BOX( defbrowser ),
@@ -242,8 +242,6 @@ defbrowser_init( Defbrowser *defbrowser )
242242

243243
defbrowser->tree = gtk_tree_view_new_with_model(
244244
GTK_TREE_MODEL( defbrowser->filter ) );
245-
gtk_tree_view_set_rules_hint( GTK_TREE_VIEW( defbrowser->tree ),
246-
TRUE );
247245
gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( defbrowser->tree ),
248246
FALSE );
249247

@@ -299,8 +297,15 @@ defbrowser_new( void )
299297
int
300298
defbrowser_get_width( Defbrowser *defbrowser )
301299
{
302-
if( defbrowser->top )
303-
return( defbrowser->top->requisition.width );
300+
if( defbrowser->top ) {
301+
GtkRequisition minimum_size;
302+
GtkRequisition natural_size;
303+
304+
gtk_widget_get_preferred_size( defbrowser->top,
305+
&minimum_size, &natural_size );
306+
307+
return( natural_size.width );
308+
}
304309
else
305310
return( 200 );
306311
}

‎src/formula.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ formula_enter_notify_event( GtkWidget *widget, GdkEventCrossing *event )
352352
event_widget = gtk_get_event_widget( (GdkEvent *) event );
353353

354354
if( event_widget == widget && event->detail != GDK_NOTIFY_INFERIOR ) {
355+
gtk_widget_set_state_flags( widget, GTK_STATE_PRELIGHT, FALSE );
356+
355357
/* Tell people about our highlight change ... used to (eg.) set
356358
* flash help.
357359
*/
@@ -369,6 +371,8 @@ formula_leave_notify_event( GtkWidget *widget, GdkEventCrossing *event )
369371
event_widget = gtk_get_event_widget( (GdkEvent *) event );
370372

371373
if( event_widget == widget && event->detail != GDK_NOTIFY_INFERIOR ) {
374+
gtk_widget_set_state_flags( widget, GTK_STATE_NORMAL, TRUE );
375+
372376
/* Tell people about our highlight change ... used to (eg.) set
373377
* flash help.
374378
*/

‎src/spin.c

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ typedef struct {
101101
} SpinEvent;
102102

103103
static void
104-
allocation2rect( GtkAllocation *from, Rect *to )
104+
allocation2rect( GtkAllocation *from, VipsRect *to )
105105
{
106106
to->left = from->x;
107107
to->top = from->y;
@@ -113,17 +113,26 @@ static void
113113
spin_button_press_event_test( GtkWidget *widget, gpointer data )
114114
{
115115
SpinEvent *sev = (SpinEvent *) data;
116-
Rect pos;
116+
117+
VipsRect pos;
118+
GtkAllocation allocation;
117119

118120
if( sev->handled )
119121
return;
120122

121-
allocation2rect( &widget->allocation, &pos );
122-
if( im_rect_includespoint( &pos, sev->x, sev->y ) ) {
123-
if( GTK_IS_ARROW( widget ) ) {
123+
gtk_widget_get_allocation( widget, &allocation );
124+
allocation2rect( &allocation, &pos );
125+
if( vips_rect_includespoint( &pos, sev->x, sev->y ) ) {
126+
127+
if( GTK_IS_IMAGE( widget ) ) {
128+
const gchar *icon_name;
129+
124130
sev->handled = TRUE;
131+
gtk_image_get_icon_name( GTK_IMAGE( widget ),
132+
&icon_name, NULL );
125133

126-
if( GTK_ARROW( widget )->arrow_type == GTK_ARROW_UP )
134+
if( icon_name &&
135+
strcmp( icon_name, "arrow-up" ) == 0 )
127136
g_signal_emit( G_OBJECT( sev->spin ),
128137
spin_signals[UP_CLICK], 0 );
129138
else
@@ -145,11 +154,16 @@ spin_button_press_event_cb( GtkWidget *widget, GdkEventButton *event,
145154
SpinEvent sev;
146155

147156
if( event->button == 1 ) {
157+
GtkAllocation allocation;
158+
148159
sev.spin = spin;
160+
149161
/* Find button x/y relative to top LH corner of spin.
150162
*/
151-
sev.x = event->x + GTK_WIDGET( spin )->allocation.x;
152-
sev.y = event->y + GTK_WIDGET( spin )->allocation.y;
163+
gtk_widget_get_allocation( GTK_WIDGET( spin ),
164+
&allocation );
165+
sev.x = event->x + allocation.x;
166+
sev.y = event->y + allocation.y;
153167
sev.handled = FALSE;
154168
spin_button_press_event_test( spin->up, &sev );
155169
spin_button_press_event_test( spin->down, &sev );
@@ -168,7 +182,7 @@ spin_button_enter_notify_event_cb( GtkWidget *widget, GdkEventCrossing *event,
168182
gboolean handled = FALSE;
169183

170184
if( event->detail != GDK_NOTIFY_INFERIOR )
171-
gtk_widget_set_state( widget, GTK_STATE_PRELIGHT );
185+
gtk_widget_set_state_flags( widget, GTK_STATE_PRELIGHT, FALSE );
172186

173187
return( handled );
174188
}
@@ -180,7 +194,7 @@ spin_button_leave_notify_event_cb( GtkWidget *widget, GdkEventCrossing *event,
180194
gboolean handled = FALSE;
181195

182196
if( event->detail != GDK_NOTIFY_INFERIOR )
183-
gtk_widget_set_state( widget, GTK_STATE_NORMAL );
197+
gtk_widget_set_state_flags( widget, GTK_STATE_NORMAL, FALSE );
184198

185199
return( handled );
186200
}
@@ -207,8 +221,10 @@ spin_init( Spin *spin )
207221
gtk_container_add( GTK_CONTAINER( ebox ), vbox );
208222
gtk_widget_show( vbox );
209223

210-
spin->up = gtk_arrow_new( GTK_ARROW_UP, GTK_SHADOW_OUT );
211-
spin->down = gtk_arrow_new( GTK_ARROW_DOWN, GTK_SHADOW_OUT );
224+
spin->up = gtk_image_new_from_icon_name( "arrow-up",
225+
GTK_ICON_SIZE_MENU );
226+
spin->down = gtk_image_new_from_icon_name( "arrow-down",
227+
GTK_ICON_SIZE_MENU );
212228
gtk_box_pack_start( GTK_BOX( vbox ), spin->up, FALSE, FALSE, 0 );
213229
gtk_box_pack_end( GTK_BOX( vbox ), spin->down, FALSE, FALSE, 0 );
214230
gtk_widget_show( spin->up );

‎src/statusview.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ statusview_class_init( StatusviewClass *class )
104104
*/
105105

106106
pane = statusview_menu = popup_build( _( "Status bar menu" ) );
107-
popup_add_but( pane, GTK_STOCK_CLOSE,
108-
POPUP_FUNC( statusview_hide_cb ) );
107+
popup_add_but( pane, "close", POPUP_FUNC( statusview_hide_cb ) );
109108
}
110109

111110
static void

‎src/subcolumnview.c

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#include "ip.h"
3535

36-
G_DEFINE_TYPE( Subcolumview, subcolumview, TYPE_VIEW );
36+
G_DEFINE_TYPE( Subcolumnview, subcolumnview, TYPE_VIEW );
3737

3838
static void *
3939
subcolumnview_destroy_sub( Rowview *rview, Subcolumnview *sview )
@@ -124,7 +124,6 @@ subcolumnview_refresh( vObject *vobject )
124124
{
125125
Subcolumnview *sview = SUBCOLUMNVIEW( vobject );
126126
Subcolumn *scol = SUBCOLUMN( VOBJECT( sview )->iobject );
127-
int model_rows = icontainer_get_n_children( ICONTAINER( scol ) );
128127
int old_nvis = sview->nvis;
129128
gboolean editable = scol->top_col->ws->mode != WORKSPACE_MODE_NOEDIT;
130129

@@ -135,27 +134,21 @@ subcolumnview_refresh( vObject *vobject )
135134
/* Top-level subcolumns look different in no-edit mode.
136135
*/
137136
if( scol->is_top && editable ) {
138-
gtk_alignment_set_padding( GTK_ALIGNMENT( sview->align ),
139-
0, 0, 0, 0 );
140137
gtk_grid_set_row_spacing( GTK_GRID( sview->grid ), 0 );
141-
gtk_grid_set_col_spacing( GTK_GRID( sview->grid ), 0 );
138+
gtk_grid_set_column_spacing( GTK_GRID( sview->grid ), 0 );
142139
}
143140
else if( scol->is_top && !editable ) {
144-
gtk_alignment_set_padding( GTK_ALIGNMENT( sview->align ),
145-
5, 5, 5, 5 );
146141
gtk_grid_set_row_spacing( GTK_GRID( sview->grid ), 5 );
147-
gtk_grid_set_col_spacing( GTK_GRID( sview->grid ), 5 );
142+
gtk_grid_set_column_spacing( GTK_GRID( sview->grid ), 5 );
148143
}
149144

150145
/* Nested subcols: we just change the left indent.
151146
*/
152147
if( !scol->is_top && editable ) {
153-
gtk_alignment_set_padding( GTK_ALIGNMENT( sview->align ),
154-
0, 0, 0, 0 );
148+
printf( "subcolumnview_refresh: set indent\n" );
155149
}
156150
else if( !scol->is_top && !editable ) {
157-
gtk_alignment_set_padding( GTK_ALIGNMENT( sview->align ),
158-
0, 0, 15, 0 );
151+
printf( "subcolumnview_refresh: set indent\n" );
159152
}
160153

161154
sview->nvis = 0;
@@ -197,13 +190,11 @@ subcolumnview_init( Subcolumnview *sview )
197190
sview->rows = 0;
198191
sview->nvis = 0;
199192

200-
sview->align = gtk_alignment_new( 0, 0, 1, 1 );
201-
gtk_box_pack_start( GTK_BOX( sview ), sview->align, FALSE, FALSE, 0 );
202193

203194
sview->grid = gtk_grid_new();
204-
gtk_container_add( GTK_CONTAINER( sview->align ), sview->grid );
195+
gtk_box_pack_start( GTK_BOX( sview ), sview->grid, FALSE, FALSE, 0 );
205196

206-
gtk_widget_show_all( sview->align );
197+
gtk_widget_show_all( sview->grid );
207198

208199
sview->group = gtk_size_group_new( GTK_SIZE_GROUP_HORIZONTAL );
209200
}

‎src/subcolumnview.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ struct _Subcolumnview {
4545

4646
/* My instance vars.
4747
*/
48-
GtkWidget *align; /* Alignment widget */
4948
GtkWidget *grid; /* Central tally area for column */
5049
int rows; /* Number of rows atm */
5150
int nvis; /* Number of children currently visible */

‎src/toggleview.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ toggleview_change_cb( GtkWidget *widget, Toggleview *togview )
4343
Toggle *tog = TOGGLE( VOBJECT( togview )->iobject );
4444
Classmodel *classmodel = CLASSMODEL( tog );
4545

46-
if( tog->value != GTK_TOGGLE_BUTTON( widget )->active ) {
47-
tog->value = GTK_TOGGLE_BUTTON( widget )->active;
46+
if( tog->value !=
47+
gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) ) ) {
48+
tog->value = gtk_toggle_button_get_active(
49+
GTK_TOGGLE_BUTTON( widget ) );
4850

4951
classmodel_update( classmodel );
5052
symbol_recalculate_all();
@@ -59,7 +61,7 @@ toggleview_refresh( vObject *vobject )
5961

6062
gtk_toggle_button_set_active(
6163
GTK_TOGGLE_BUTTON( togview->toggle ), tog->value );
62-
set_glabel( GTK_BIN( togview->toggle )->child, "%s",
64+
set_glabel( gtk_bin_get_child( GTK_BIN( togview->toggle ) ), "%s",
6365
IOBJECT( tog )->caption );
6466

6567
VOBJECT_CLASS( toggleview_parent_class )->refresh( vobject );

‎src/toolkitbrowser.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ toolkitbrowser_init( Toolkitbrowser *toolkitbrowser )
252252
toolkitbrowser );
253253
gtk_box_pack_end( GTK_BOX( toolkitbrowser->top ),
254254
toolkitbrowser->entry, FALSE, FALSE, 2 );
255-
label = gtk_image_new_from_icon_name( GTK_STOCK_FIND, GTK_ICON_SIZE_MENU );
255+
label = gtk_image_new_from_icon_name( "find", GTK_ICON_SIZE_MENU );
256256
gtk_box_pack_end( GTK_BOX( toolkitbrowser->top ),
257257
label, FALSE, FALSE, 0 );
258258
gtk_box_pack_start( GTK_BOX( toolkitbrowser ),
@@ -273,8 +273,6 @@ toolkitbrowser_init( Toolkitbrowser *toolkitbrowser )
273273

274274
toolkitbrowser->tree = gtk_tree_view_new_with_model(
275275
GTK_TREE_MODEL( toolkitbrowser->filter ) );
276-
gtk_tree_view_set_rules_hint( GTK_TREE_VIEW( toolkitbrowser->tree ),
277-
TRUE );
278276

279277
renderer = gtk_cell_renderer_text_new();
280278
column = gtk_tree_view_column_new_with_attributes( _( "Action" ),
@@ -327,8 +325,16 @@ toolkitbrowser_new( void )
327325
int
328326
toolkitbrowser_get_width( Toolkitbrowser *toolkitbrowser )
329327
{
330-
if( toolkitbrowser->top )
331-
return( toolkitbrowser->top->requisition.width );
328+
if( toolkitbrowser->top ) {
329+
GtkRequisition minimum_size;
330+
GtkRequisition natural_size;
331+
332+
gtk_widget_get_preferred_size(
333+
GTK_WIDGET( toolkitbrowser->top ),
334+
&minimum_size, &natural_size );
335+
336+
return( natural_size.width );
337+
}
332338
else
333339
return( 200 );
334340
}

‎src/toolview.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ item_get_workspace( GtkWidget *item )
6565
{
6666
Toolview *tview;
6767

68-
if( !(tview = g_object_get_data_by_id( G_OBJECT( item ),
69-
toolview_quark )) )
68+
if( !(tview = g_object_get_qdata( G_OBJECT( item ), toolview_quark )) )
7069
return( NULL );
7170

7271
return( toolview_get_workspace( tview ) );

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy