Sakura

Merge lp:~ikenfin/sakura/scrollable-tab-panel into lp:~dabisu/sakura/sakura

  1. scrollable-tab-panel
  2. Merge into sakura
Proposed by Tominov Sergey
Status: Merged
Merge reported by: David Gómez
Merged at revision: not available
Proposed branch: lp:~ikenfin/sakura/scrollable-tab-panel
Merge into: lp:~dabisu/sakura/sakura
Diff against target: 39 lines (+8/-0)
1 file modified
src/sakura.c (+8/-0)
To merge this branch: bzr merge lp:~ikenfin/sakura/scrollable-tab-panel
Reviewer Review Type Date Requested Status
David Gómez Approve
Review via email: mp+299392@code.launchpad.net

Description of the change

Added new option - 'scrollable_tabs', to provide tab behavior like in old versions of sakura.
It seems that in newer versions of sakura, window width increasing when you adding a tabs (tested on Ubuntu's Gnome 3.18).

To post a comment you must log in.
Revision history for this message
David Gómez (dabisu) wrote :

Thanks for the patch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/sakura.c'
2--- src/sakura.c 2016-07-07 09:08:36 +0000
3+++ src/sakura.c 2016-07-07 09:35:55 +0000
4@@ -264,6 +264,7 @@
5 bool focused; /* For fading feature */
6 bool first_focus; /* Did this window already register its first WM-focus? */
7 bool use_fading;
8+ bool scrollable_tabs;
9 GtkWidget *item_copy_link; /* We include here only the items which need to be hidden */
10 GtkWidget *item_open_link;
11 GtkWidget *open_link_separator;
12@@ -347,6 +348,7 @@
13 #define DEFAULT_FULLSCREEN_KEY GDK_KEY_F11
14 #define DEFAULT_INCREASE_FONT_SIZE_KEY GDK_KEY_plus
15 #define DEFAULT_DECREASE_FONT_SIZE_KEY GDK_KEY_minus
16+#define DEFAULT_SCROLLABLE_TABS FALSE
17
18 /* make this an array instead of #defines to get a compile time
19 * error instead of a runtime if NUM_COLORSETS changes */
20@@ -2214,6 +2216,11 @@
21 }
22 sakura.icon = g_key_file_get_string(sakura.cfg, cfg_group, "icon_file", NULL);
23
24+ if(!g_key_file_has_key(sakura.cfg, cfg_group, "scrollable_tabs", NULL)) {
25+ sakura_set_config_string("scrollable_tabs", DEFAULT_SCROLLABLE_TABS);
26+ }
27+ sakura.scrollable_tabs = g_key_file_get_string(sakura.cfg, cfg_group, "scrollable_tabs", NULL);
28+
29 /* set default title pattern from config or NULL */
30 sakura.tab_default_title = g_key_file_get_string(sakura.cfg, cfg_group, "tab_default_title", NULL);
31
32@@ -2230,6 +2237,7 @@
33 sakura.rows = DEFAULT_ROWS;
34
35 sakura.notebook=gtk_notebook_new();
36+ gtk_notebook_set_scrollable((GtkNotebook*)sakura.notebook, sakura.scrollable_tabs);
37
38 /* Adding mask, for handle scroll events */
39 gtk_widget_add_events(sakura.notebook, GDK_SCROLL_MASK);

Subscribers

People subscribed via source and target branches