overlay-scrollbar

Merge lp:~cimi/overlay-scrollbar/new-thumb-dimensions into lp:overlay-scrollbar

  1. new-thumb-dimensions
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 176
Proposed branch: lp:~cimi/overlay-scrollbar/new-thumb-dimensions
Merge into: lp:overlay-scrollbar
Diff against target: 66 lines (+8/-12)
3 files modified
os/os-private.h (+4/-0)
os/os-scrollbar.c (+4/-8)
os/os-thumb.c (+0/-4)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/new-thumb-dimensions
Reviewer Review Type Date Requested Status
Loïc Molinari (community) Approve
Review via email: mp+55181@code.launchpad.net

Description of the change

Simple modification to thumb dimensions accordingly with the visuals from the design team

To post a comment you must log in.
Revision history for this message
Loïc Molinari (loic.molinari) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-private.h'
2--- os/os-private.h 2011-03-14 15:17:25 +0000
3+++ os/os-private.h 2011-03-28 16:20:36 +0000
4@@ -30,6 +30,10 @@
5 #pragma GCC visibility push(hidden)
6 #endif /* __GNUC__ */
7
8+/* Default size of the thumb in pixels. */
9+#define DEFAULT_THUMB_WIDTH 15
10+#define DEFAULT_THUMB_HEIGHT 67
11+
12 G_BEGIN_DECLS
13
14 /* os-log.c */
15
16=== modified file 'os/os-scrollbar.c'
17--- os/os-scrollbar.c 2011-03-24 16:50:02 +0000
18+++ os/os-scrollbar.c 2011-03-28 16:20:36 +0000
19@@ -31,10 +31,6 @@
20 /* Default size of the pager in pixels. */
21 #define DEFAULT_PAGER_WIDTH 3
22
23-/* Default size of the scrollbar in pixels. */
24-#define DEFAULT_SCROLLBAR_WIDTH 15
25-#define DEFAULT_SCROLLBAR_HEIGHT 80
26-
27 /* Width of the proximity effect in pixels. */
28 #define PROXIMITY_WIDTH 30
29
30@@ -1373,8 +1369,8 @@
31
32 if (priv->orientation == GTK_ORIENTATION_VERTICAL)
33 {
34- priv->slider.width = DEFAULT_SCROLLBAR_WIDTH;
35- priv->slider.height = DEFAULT_SCROLLBAR_HEIGHT;
36+ priv->slider.width = DEFAULT_THUMB_WIDTH;
37+ priv->slider.height = DEFAULT_THUMB_HEIGHT;
38 priv->overlay_all.x = allocation->x - DEFAULT_PAGER_WIDTH;
39 priv->thumb_all.x = allocation->x;
40
41@@ -1387,8 +1383,8 @@
42 }
43 else
44 {
45- priv->slider.width = DEFAULT_SCROLLBAR_HEIGHT;
46- priv->slider.height = DEFAULT_SCROLLBAR_WIDTH;
47+ priv->slider.width = DEFAULT_THUMB_HEIGHT;
48+ priv->slider.height = DEFAULT_THUMB_WIDTH;
49 priv->overlay_all.y = allocation->y - DEFAULT_PAGER_WIDTH ;
50 priv->thumb_all.y = allocation->y;
51
52
53=== modified file 'os/os-thumb.c'
54--- os/os-thumb.c 2011-03-22 11:58:59 +0000
55+++ os/os-thumb.c 2011-03-28 16:20:36 +0000
56@@ -26,10 +26,6 @@
57
58 #include "os-private.h"
59
60-/* Default size of the thumb in pixels. */
61-#define DEFAULT_THUMB_WIDTH 15
62-#define DEFAULT_THUMB_HEIGHT 80
63-
64 struct _OsThumbPrivate {
65 GtkOrientation orientation;
66 GtkWidget *grabbed_widget;

Subscribers

People subscribed via source and target branches