overlay-scrollbar

Merge lp:~cimi/overlay-scrollbar/new_0_2_series into lp:overlay-scrollbar

  1. new_0_2_series
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Ted Gould
Approved revision: 237
Merged at revision: 236
Proposed branch: lp:~cimi/overlay-scrollbar/new_0_2_series
Merge into: lp:overlay-scrollbar
Diff against target: 98 lines (+32/-3)
3 files modified
configure.ac (+2/-2)
os/os-scrollbar.c (+20/-0)
os/os-utils.c (+10/-1)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/new_0_2_series
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+61316@code.launchpad.net
To post a comment you must log in.
lp:~cimi/overlay-scrollbar/new_0_2_series updated
237. By Andrea Cimitan

Fix qgtkstyle

Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-05-12 11:31:54 +0000
3+++ configure.ac 2011-05-17 21:46:25 +0000
4@@ -2,7 +2,7 @@
5
6 # Package
7
8-AC_INIT([overlay-scrollbar],[0.1.12.1],[https://bugs.launchpad.net/ayatana-scrollbar],[overlay-scrollbar])
9+AC_INIT([overlay-scrollbar],[0.2.0.1],[https://bugs.launchpad.net/ayatana-scrollbar],[overlay-scrollbar])
10 AC_CONFIG_SRCDIR([os/os-scrollbar.h])
11 AC_CONFIG_MACRO_DIR([build])
12 AC_CONFIG_AUX_DIR([build])
13@@ -18,7 +18,7 @@
14 # - interfaces added -> increment AGE
15 # - interfaces removed -> AGE = 0
16 OS_LT_CURRENT=0
17-OS_LT_REV=12
18+OS_LT_REV=0
19 OS_LT_AGE=0
20 OS_LT_VERSION="$OS_LT_CURRENT:$OS_LT_REV:$OS_LT_AGE"
21 OS_LT_LDFLAGS="-version-info $OS_LT_VERSION"
22
23=== modified file 'os/os-scrollbar.c'
24--- os/os-scrollbar.c 2011-05-17 17:20:52 +0000
25+++ os/os-scrollbar.c 2011-05-17 21:46:25 +0000
26@@ -93,6 +93,7 @@
27 static void os_scrollbar_realize (GtkWidget *widget);
28 static void os_scrollbar_show (GtkWidget *widget);
29 static void os_scrollbar_size_allocate (GtkWidget *widget, GdkRectangle *allocation);
30+static void os_scrollbar_size_request (GtkWidget *widget, GtkRequisition *requisition);
31 static void os_scrollbar_unmap (GtkWidget *widget);
32 static void os_scrollbar_unrealize (GtkWidget *widget);
33 static void os_scrollbar_dispose (GObject *object);
34@@ -1672,6 +1673,7 @@
35 widget_class->realize = os_scrollbar_realize;
36 widget_class->show = os_scrollbar_show;
37 widget_class->size_allocate = os_scrollbar_size_allocate;
38+ widget_class->size_request = os_scrollbar_size_request;
39 widget_class->unmap = os_scrollbar_unmap;
40 widget_class->unrealize = os_scrollbar_unrealize;
41
42@@ -1968,6 +1970,24 @@
43 }
44
45 static void
46+os_scrollbar_size_request (GtkWidget *widget,
47+ GtkRequisition *requisition)
48+{
49+ OsScrollbar *scrollbar;
50+ OsScrollbarPrivate *priv;
51+
52+ scrollbar = OS_SCROLLBAR (widget);
53+ priv = scrollbar->priv;
54+
55+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
56+ requisition->width = 0;
57+ else
58+ requisition->height = 0;
59+
60+ widget->requisition = *requisition;
61+}
62+
63+static void
64 os_scrollbar_unmap (GtkWidget *widget)
65 {
66 OsScrollbar *scrollbar;
67
68=== modified file 'os/os-utils.c'
69--- os/os-utils.c 2011-04-26 22:33:59 +0000
70+++ os/os-utils.c 2011-05-17 21:46:25 +0000
71@@ -34,7 +34,6 @@
72 /* Black-list of program names retrieved with g_get_prgname(). */
73 static const gchar *const blacklist[] = {
74 "apport-gtk",
75- "Banshee",
76 "codeblocks",
77 "codelite",
78 "eclipse",
79@@ -48,9 +47,19 @@
80 "vmware"
81 };
82
83+ GModule *module;
84+ gpointer func;
85 gint32 i;
86 const gint32 nr_programs = G_N_ELEMENTS (blacklist);
87
88+ module = g_module_open (NULL, 0);
89+ if (g_module_symbol (module, "qt_startup_hook", &func))
90+ {
91+ g_module_close (module);
92+ return TRUE;
93+ }
94+ g_module_close (module);
95+
96 /* Black list RTL languages, not supported yet */
97 if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
98 return TRUE;

Subscribers

People subscribed via source and target branches