aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYosef Or Boczko <yoseforb@gmail.com>2013-08-30 17:06:49 +0800
committerYosef Or Boczko <yoseforb@gmail.com>2013-08-30 17:06:49 +0800
commita93f0f4947ace896ab040d6ae7c54216786fa4c4 (patch)
treed3b7454035d483bfb8059d4411f2c0f2d4fc5598
parent2f7bc20a4d95406df0bd1a1e4fd6cd98ba18d253 (diff)
downloadgsoc2013-epiphany-a93f0f4947ace896ab040d6ae7c54216786fa4c4.tar
gsoc2013-epiphany-a93f0f4947ace896ab040d6ae7c54216786fa4c4.tar.gz
gsoc2013-epiphany-a93f0f4947ace896ab040d6ae7c54216786fa4c4.tar.bz2
gsoc2013-epiphany-a93f0f4947ace896ab040d6ae7c54216786fa4c4.tar.lz
gsoc2013-epiphany-a93f0f4947ace896ab040d6ae7c54216786fa4c4.tar.xz
gsoc2013-epiphany-a93f0f4947ace896ab040d6ae7c54216786fa4c4.tar.zst
gsoc2013-epiphany-a93f0f4947ace896ab040d6ae7c54216786fa4c4.zip
ephy-window: Use the top bar GtkBox as titlebar
The GtkEventBox is to ensure opacity (see bug #706045). https://bugzilla.gnome.org/show_bug.cgi?id=706050
-rw-r--r--src/ephy-window.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 6f9985f15..1e773824a 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3709,15 +3709,18 @@ lock_clicked_cb (EphyLocationController *controller,
static GtkWidget *
setup_toolbar (EphyWindow *window)
{
+ GtkWidget *event_box;
GtkWidget *toolbar;
GtkAction *action;
EphyWindowPrivate *priv = window->priv;
+ event_box = gtk_event_box_new ();
toolbar = ephy_toolbar_new (window);
gtk_widget_set_margin_left (toolbar, 4);
gtk_widget_set_margin_right (toolbar, 4);
- gtk_box_pack_start (GTK_BOX (priv->main_vbox),
- toolbar, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (event_box), toolbar);
+ gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), TRUE);
+ gtk_window_set_titlebar (GTK_WINDOW (window), event_box);
action = gtk_action_group_get_action (priv->toolbar_action_group,
"NavigationBack");
@@ -4121,9 +4124,6 @@ ephy_window_init (EphyWindow *window)
g_signal_connect (ephy_embed_shell_get_default (),
"download-added", G_CALLBACK (download_added_cb),
window);
-
- gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window),
- TRUE);
}
/**