Attachment #185593 for bug #261123

View | Details | Raw Unified | Return to bug 261123
Collapse All | Expand All




static void main_window_zoom_out_cb (GtkWidget *, gpointer);
static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);

#if defined (HAVE_CUPS)
static void main_window_print_cb (GtkWidget *, gpointer);

    pter->setPageMode (mode);
}

gboolean
main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
{
    g_assert ( NULL != data && "The data parameter is NULL.");

    MainPter *pter = (MainPter *)data;
    // Only zoom when the CTRL-Button is down...
    if ( !(event->state & GDK_CONTROL_MASK) ) return FALSE;
    if ( event->direction == GDK_SCROLL_UP ) {
        pter->zoomInActivated ();
    } else if ( event->direction == GDK_SCROLL_DOWN ) {
        pter->zoomOutActivated ();
    }
    return TRUE;
}


Return to bug 261123

Lines 77-83 Link Here

(-)MainView.cxx.old (-3 / +4 lines)
77	static void main_window_zoom_out_cb (GtkWidget *, gpointer);	77	static void main_window_zoom_out_cb (GtkWidget *, gpointer);
78	static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);	78	static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
79	static void main_window_set_page_mode (GtkRadioAction , GtkRadioAction , gpointer);	79	static void main_window_set_page_mode (GtkRadioAction , GtkRadioAction , gpointer);
80	static void main_window_page_scrolled_cb (GtkWidget widget, GdkEventScroll event, gpointer data);	80	static gboolean main_window_page_scrolled_cb (GtkWidget widget, GdkEventScroll event, gpointer data);
81		81
82	#if defined (HAVE_CUPS)	82	#if defined (HAVE_CUPS)
83	static void main_window_print_cb (GtkWidget *, gpointer);	83	static void main_window_print_cb (GtkWidget *, gpointer);
Lines 1479-1496 Link Here
1479	pter->setPageMode (mode);	1479	pter->setPageMode (mode);
1480	}	1480	}
1481		1481
1482	void	1482	gboolean
1483	main_window_page_scrolled_cb (GtkWidget widget, GdkEventScroll event, gpointer data)	1483	main_window_page_scrolled_cb (GtkWidget widget, GdkEventScroll event, gpointer data)
1484	{	1484	{
1485	g_assert ( NULL != data && "The data parameter is NULL.");	1485	g_assert ( NULL != data && "The data parameter is NULL.");
1486		1486
1487	MainPter pter = (MainPter )data;	1487	MainPter pter = (MainPter )data;
1488	// Only zoom when the CTRL-Button is down...	1488	// Only zoom when the CTRL-Button is down...
1489	if ( !(event->state & GDK_CONTROL_MASK) ) return;	1489	if ( !(event->state & GDK_CONTROL_MASK) ) return FALSE;
1490	if ( event->direction == GDK_SCROLL_UP ) {	1490	if ( event->direction == GDK_SCROLL_UP ) {
1491	pter->zoomInActivated ();	1491	pter->zoomInActivated ();
1492	} else if ( event->direction == GDK_SCROLL_DOWN ) {	1492	} else if ( event->direction == GDK_SCROLL_DOWN ) {
1493	pter->zoomOutActivated ();	1493	pter->zoomOutActivated ();
1494	}	1494	}
		1495	return TRUE;
1495	}	1496	}
1496		1497