OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008 Holger Hans Peter Freyther | 2 * Copyright (C) 2007, 2008 Holger Hans Peter Freyther |
3 * Copyright (C) 2007, 2008 Christian Dywan <christian@imendio.com> | 3 * Copyright (C) 2007, 2008 Christian Dywan <christian@imendio.com> |
4 * Copyright (C) 2008 Nuanti Ltd. | 4 * Copyright (C) 2008 Nuanti Ltd. |
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
6 * Copyright (C) 2008 Gustavo Noronha Silva <gns@gnome.org> | 6 * Copyright (C) 2008 Gustavo Noronha Silva <gns@gnome.org> |
7 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 7 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
8 * Copyright (C) 2012 Igalia S. L. | 8 * Copyright (C) 2012 Igalia S. L. |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 gboolean autoResizeWindow; | 131 gboolean autoResizeWindow; |
132 WebKitWebSettings* settings = webkit_web_view_get_settings(m_webView); | 132 WebKitWebSettings* settings = webkit_web_view_get_settings(m_webView); |
133 g_object_get(settings, "auto-resize-window", &autoResizeWindow, NULL); | 133 g_object_get(settings, "auto-resize-window", &autoResizeWindow, NULL); |
134 | 134 |
135 if (!autoResizeWindow) | 135 if (!autoResizeWindow) |
136 return; | 136 return; |
137 | 137 |
138 GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView)); | 138 GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView)); |
139 if (widgetIsOnscreenToplevelWindow(window)) { | 139 if (widgetIsOnscreenToplevelWindow(window)) { |
140 gtk_window_move(GTK_WINDOW(window), intrect.x(), intrect.y()); | 140 gtk_window_move(GTK_WINDOW(window), intrect.x(), intrect.y()); |
141 gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height())
; | 141 if (!intrect.isEmpty()) |
| 142 gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.heigh
t()); |
142 } | 143 } |
143 } | 144 } |
144 | 145 |
145 static IntRect getWebViewRect(WebKitWebView* webView) | 146 static IntRect getWebViewRect(WebKitWebView* webView) |
146 { | 147 { |
147 GtkAllocation allocation; | 148 GtkAllocation allocation; |
148 gtk_widget_get_allocation(GTK_WIDGET(webView), &allocation); | 149 gtk_widget_get_allocation(GTK_WIDGET(webView), &allocation); |
149 return IntRect(allocation.x, allocation.y, allocation.width, allocation.heig
ht); | 150 return IntRect(allocation.x, allocation.y, allocation.width, allocation.heig
ht); |
150 } | 151 } |
151 | 152 |
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1026 #if USE(CLUTTER) | 1027 #if USE(CLUTTER) |
1027 // Currently, we only support CSS 3D Transforms. | 1028 // Currently, we only support CSS 3D Transforms. |
1028 return ThreeDTransformTrigger; | 1029 return ThreeDTransformTrigger; |
1029 #else | 1030 #else |
1030 return AllTriggers; | 1031 return AllTriggers; |
1031 #endif | 1032 #endif |
1032 } | 1033 } |
1033 #endif | 1034 #endif |
1034 | 1035 |
1035 } | 1036 } |
OLD | NEW |