Changeset 174724 in webkit


Ignore:
Timestamp:
Oct 15, 2014 12:33:44 AM (9 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Minibrowser : Add keyboard support for zoom in , zoom out and default zoom in GTK Minibrowser
https://bugs.webkit.org/show_bug.cgi?id=137060

Patch by Rohit Kumar <kumar.rohit@samsung.com> on 2014-10-15
Reviewed by Philippe Normand.

Add keyboard support for zoom in , zoom out and default zoom using 'Ctrl' + '+', 'Ctrl' + '-' and 'Ctrl' + '0' respectively.

  • MiniBrowser/gtk/BrowserWindow.c:

(zoomInCallback):
(zoomOutCallback):
(defaultZoomCallback): Callback for default zoom keyboard support.
(browser_window_init):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r174702 r174724  
     12014-10-15  Rohit Kumar  <kumar.rohit@samsung.com>
     2
     3        [GTK] Minibrowser : Add keyboard support for zoom in , zoom out and default zoom in GTK Minibrowser
     4        https://bugs.webkit.org/show_bug.cgi?id=137060
     5
     6        Reviewed by Philippe Normand.
     7
     8        Add keyboard support for zoom in , zoom out and default zoom using 'Ctrl' + '+', 'Ctrl' + '-' and 'Ctrl' + '0' respectively.
     9
     10        * MiniBrowser/gtk/BrowserWindow.c:
     11        (zoomInCallback):
     12        (zoomOutCallback):
     13        (defaultZoomCallback): Callback for default zoom keyboard support.
     14        (browser_window_init):
     15
    1162014-10-14  Simon Fraser  <simon.fraser@apple.com>
    217
  • trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

    r174679 r174724  
    7777static const gdouble minimumZoomLevel = 0.5;
    7878static const gdouble maximumZoomLevel = 3;
     79static const gdouble defaultZoomLevel = 1;
    7980static const gdouble zoomStep = 1.2;
    8081static gint windowCount = 0;
     
    502503static void zoomInCallback(BrowserWindow *window)
    503504{
    504     gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) * zoomStep;
    505     webkit_web_view_set_zoom_level(window->webView, zoomLevel);
     505    if (browserWindowCanZoomIn(window)) {
     506        gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) * zoomStep;
     507        webkit_web_view_set_zoom_level(window->webView, zoomLevel);
     508    }
    506509}
    507510
    508511static void zoomOutCallback(BrowserWindow *window)
    509512{
    510     gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) / zoomStep;
    511     webkit_web_view_set_zoom_level(window->webView, zoomLevel);
     513    if (browserWindowCanZoomOut(window)) {
     514        gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) / zoomStep;
     515        webkit_web_view_set_zoom_level(window->webView, zoomLevel);
     516    }
     517}
     518
     519static void defaultZoomCallback(BrowserWindow *window)
     520{
     521    webkit_web_view_set_zoom_level(window->webView, defaultZoomLevel);
    512522}
    513523
     
    646656    gtk_accel_group_connect(window->accelGroup, GDK_KEY_Home, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE,
    647657        g_cclosure_new_swap(G_CALLBACK(loadHomePage), window, NULL));
     658
     659    /* Zoom in, zoom out and default zoom*/
     660    gtk_accel_group_connect(window->accelGroup, GDK_KEY_equal, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE,
     661        g_cclosure_new_swap(G_CALLBACK(zoomInCallback), window, NULL));
     662    gtk_accel_group_connect(window->accelGroup, GDK_KEY_KP_Add, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE,
     663        g_cclosure_new_swap(G_CALLBACK(zoomInCallback), window, NULL));
     664    gtk_accel_group_connect(window->accelGroup, GDK_KEY_minus, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE,
     665        g_cclosure_new_swap(G_CALLBACK(zoomOutCallback), window, NULL));
     666    gtk_accel_group_connect(window->accelGroup, GDK_KEY_KP_Subtract, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE,
     667        g_cclosure_new_swap(G_CALLBACK(zoomOutCallback), window, NULL));
     668    gtk_accel_group_connect(window->accelGroup, GDK_KEY_0, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE,
     669        g_cclosure_new_swap(G_CALLBACK(defaultZoomCallback), window, NULL));
     670    gtk_accel_group_connect(window->accelGroup, GDK_KEY_KP_0, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE,
     671        g_cclosure_new_swap(G_CALLBACK(defaultZoomCallback), window, NULL));
    648672
    649673    GtkWidget *toolbar = gtk_toolbar_new();
Note: See TracChangeset for help on using the changeset viewer.