Midori Web Browser

Merge lp:~danleweb/midori/bug_lp-1037818 into lp:midori

  1. bug_lp-1037818
  2. Merge into trunk
Proposed by Dan
Status: Work in progress
Proposed branch: lp:~danleweb/midori/bug_lp-1037818
Merge into: lp:midori
Diff against target: 26 lines (+7/-2)
1 file modified
midori/midori-panel.c (+7/-2)
To merge this branch: bzr merge lp:~danleweb/midori/bug_lp-1037818
Reviewer Review Type Date Requested Status
Cris Dywan Needs Fixing
Review via email: mp+233110@code.launchpad.net

Commit message

Set alignment on panel rather than border width

Description of the change

This branch fix the bug: https://bugs.launchpad.net/midori/+bug/1037818

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

At a quick glance there's uncommented code. Please remove those.

review: Needs Fixing
Reply
lp:~danleweb/midori/bug_lp-1037818 updated
6792. By Dan

Remove commented code

Revision history for this message
Dan (danleweb) wrote :

The commented code was removed. Please review it.

Reply

Unmerged revisions

6792. By Dan

Remove commented code

6791. By Dan

bug_lp-1037818

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-panel.c'
2--- midori/midori-panel.c 2013-10-28 19:54:21 +0000
3+++ midori/midori-panel.c 2014-09-11 19:17:57 +0000
4@@ -280,6 +280,7 @@
5 GtkWidget* vbox;
6 GtkWidget* labelbar;
7 GtkToolItem* toolitem;
8+ GtkWidget* alignment;
9
10 panel->action_group = NULL;
11 panel->show_titles = TRUE;
12@@ -306,8 +307,12 @@
13 panel->toolbar_label = gtk_label_new (NULL);
14 gtk_label_set_ellipsize (GTK_LABEL (panel->toolbar_label), PANGO_ELLIPSIZE_END);
15 gtk_misc_set_alignment (GTK_MISC (panel->toolbar_label), 0, 0.5);
16- gtk_container_add (GTK_CONTAINER (toolitem), panel->toolbar_label);
17- gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6);
18+
19+ alignment = gtk_alignment_new(0, 0.5, 1, 0);
20+ gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 6, 6);
21+ gtk_container_add (GTK_CONTAINER (toolitem), alignment);
22+ gtk_container_add (GTK_CONTAINER (alignment), panel->toolbar_label);
23+
24 gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1);
25 toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
26 gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem),

Subscribers

People subscribed via source and target branches

to all changes: