<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183919] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183919">183919</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-07 01:02:24 -0700 (Thu, 07 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Remove dock button from Web Inspector window
https://bugs.webkit.org/show_bug.cgi?id=144728
Reviewed by Sergio Villar Senin.
We added the dock buttons to the headerbar, because they were
removed from the inspector toolbar, but with the new tabbed
design, the dock buttons are back in the toolbar and look redundant.
* UIProcess/WebInspectorProxy.h:
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::createInspectorWindow):
(WebKit::WebInspectorProxy::platformAttachAvailabilityChanged):
(WebKit::WebInspectorProxy::dockButtonClicked): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183918 => 183919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-07 07:09:06 UTC (rev 183918)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-07 08:02:24 UTC (rev 183919)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Remove dock button from Web Inspector window
+ https://bugs.webkit.org/show_bug.cgi?id=144728
+
+ Reviewed by Sergio Villar Senin.
+
+ We added the dock buttons to the headerbar, because they were
+ removed from the inspector toolbar, but with the new tabbed
+ design, the dock buttons are back in the toolbar and look redundant.
+
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::createInspectorWindow):
+ (WebKit::WebInspectorProxy::platformAttachAvailabilityChanged):
+ (WebKit::WebInspectorProxy::dockButtonClicked): Deleted.
+
</ins><span class="cx"> 2015-05-06 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (183918 => 183919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2015-05-07 07:09:06 UTC (rev 183918)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2015-05-07 08:02:24 UTC (rev 183919)
</span><span class="lines">@@ -216,7 +216,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> void updateInspectorWindowTitle() const;
</span><del>- static void dockButtonClicked(GtkWidget*, WebInspectorProxy*);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static const unsigned minimumWindowWidth;
</span><span class="lines">@@ -252,8 +251,6 @@
</span><span class="cx"> GtkWidget* m_inspectorView {nullptr};
</span><span class="cx"> GtkWidget* m_inspectorWindow {nullptr};
</span><span class="cx"> GtkWidget* m_headerBar {nullptr};
</span><del>- GtkWidget* m_dockBottomButton {nullptr};
- GtkWidget* m_dockRightButton {nullptr};
</del><span class="cx"> String m_inspectedURLString;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> Evas_Object* m_inspectorView {nullptr};
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (183918 => 183919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2015-05-07 07:09:06 UTC (rev 183918)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2015-05-07 08:02:24 UTC (rev 183919)
</span><span class="lines">@@ -78,16 +78,6 @@
</span><span class="cx"> return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebInspectorProxy::dockButtonClicked(GtkWidget* button, WebInspectorProxy* inspector)
-{
- if (button == inspector->m_dockBottomButton)
- inspector->attach(AttachmentSide::Bottom);
- else if (button == inspector->m_dockRightButton)
- inspector->attach(AttachmentSide::Right);
- else
- ASSERT_NOT_REACHED();
-}
-
</del><span class="cx"> void WebInspectorProxy::createInspectorWindow()
</span><span class="cx"> {
</span><span class="cx"> if (m_client.openWindow(this))
</span><span class="lines">@@ -103,25 +93,6 @@
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 10, 0)
</span><span class="cx"> m_headerBar = gtk_header_bar_new();
</span><span class="cx"> gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(m_headerBar), TRUE);
</span><del>-
- m_dockBottomButton = gtk_button_new();
- g_object_add_weak_pointer(G_OBJECT(m_dockBottomButton), reinterpret_cast<void**>(&m_dockBottomButton));
- g_signal_connect(m_dockBottomButton, "clicked", G_CALLBACK(dockButtonClicked), this);
- gtk_widget_set_sensitive(m_dockBottomButton, canAttach());
- gtk_button_set_relief(GTK_BUTTON(m_dockBottomButton), GTK_RELIEF_NONE);
- gtk_button_set_image(GTK_BUTTON(m_dockBottomButton), gtk_image_new_from_resource("/org/webkitgtk/inspector/UserInterface/Images/DockBottom.svg"));
- gtk_header_bar_pack_start(GTK_HEADER_BAR(m_headerBar), m_dockBottomButton);
- gtk_widget_show(m_dockBottomButton);
-
- m_dockRightButton = gtk_button_new();
- g_object_add_weak_pointer(G_OBJECT(m_dockRightButton), reinterpret_cast<void**>(&m_dockRightButton));
- g_signal_connect(m_dockRightButton, "clicked", G_CALLBACK(dockButtonClicked), this);
- gtk_widget_set_sensitive(m_dockRightButton, canAttach());
- gtk_button_set_relief(GTK_BUTTON(m_dockRightButton), GTK_RELIEF_NONE);
- gtk_button_set_image(GTK_BUTTON(m_dockRightButton), gtk_image_new_from_resource("/org/webkitgtk/inspector/UserInterface/Images/DockRight.svg"));
- gtk_header_bar_pack_start(GTK_HEADER_BAR(m_headerBar), m_dockRightButton);
- gtk_widget_show(m_dockRightButton);
-
</del><span class="cx"> gtk_window_set_titlebar(GTK_WINDOW(m_inspectorWindow), m_headerBar);
</span><span class="cx"> gtk_widget_show(m_headerBar);
</span><span class="cx"> #endif
</span><span class="lines">@@ -323,10 +294,6 @@
</span><span class="cx"> void WebInspectorProxy::platformAttachAvailabilityChanged(bool available)
</span><span class="cx"> {
</span><span class="cx"> m_client.didChangeAttachAvailability(this, available);
</span><del>- if (m_dockBottomButton && m_dockRightButton) {
- gtk_widget_set_sensitive(m_dockBottomButton, available);
- gtk_widget_set_sensitive(m_dockRightButton, available);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>