Compiz

Merge lp:~muktupavels/compiz/ccsm-borders into lp:compiz/0.9.13

  1. ccsm-borders
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4162
Merged at revision: 4167
Proposed branch: lp:~muktupavels/compiz/ccsm-borders
Merge into: lp:compiz/0.9.13
Diff against target: 73 lines (+10/-6)
2 files modified
compizconfig/ccsm/ccm/Pages.py (+5/-0)
compizconfig/ccsm/ccm/Widgets.py (+5/-6)
To merge this branch: bzr merge lp:~muktupavels/compiz/ccsm-borders
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Marco Trevisan (Treviño) Pending
Review via email: mp+349665@code.launchpad.net

Commit message

ccsm: add borders in few places.

Description of the change

- Add border to PluginBox, GroupBox and SubGroupBox.
- Add border and background to PluginWindow.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/ccsm/ccm/Pages.py'
2--- compizconfig/ccsm/ccm/Pages.py 2018-07-12 14:25:13 +0000
3+++ compizconfig/ccsm/ccm/Pages.py 2018-07-16 23:46:19 +0000
4@@ -323,6 +323,7 @@
5 self.SelectorBoxes.set_spacing(5)
6
7 scroll = Gtk.ScrolledWindow()
8+ scroll.set_shadow_type (Gtk.ShadowType.IN)
9 scroll.props.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC
10 scroll.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC
11 scroll.set_min_content_width(250)
12@@ -330,6 +331,8 @@
13 scroll.add(self.PluginBox)
14 self.SelectorBoxes.pack_start(scroll, False, False, 0)
15 scroll = Gtk.ScrolledWindow()
16+ scroll.set_no_show_all(True)
17+ scroll.set_shadow_type (Gtk.ShadowType.IN)
18 scroll.props.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC
19 scroll.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC
20 scroll.set_min_content_width(220)
21@@ -338,6 +341,8 @@
22 self.SelectorBoxes.pack_start(scroll, False, False, 0)
23 scroll = Gtk.ScrolledWindow()
24 scroll.add(self.SubGroupBox)
25+ scroll.set_no_show_all(True)
26+ scroll.set_shadow_type (Gtk.ShadowType.IN)
27 scroll.props.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC
28 scroll.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC
29 scroll.set_min_content_width(220)
30
31=== modified file 'compizconfig/ccsm/ccm/Widgets.py'
32--- compizconfig/ccsm/ccm/Widgets.py 2018-07-12 14:41:42 +0000
33+++ compizconfig/ccsm/ccm/Widgets.py 2018-07-16 23:46:19 +0000
34@@ -199,8 +199,7 @@
35 self.append_column(column)
36
37 self.get_selection().connect('changed', self.SelectionChanged)
38- self.hide()
39- self.props.no_show_all = True
40+ self.show()
41
42 def Update(self, items):
43 self.model.clear()
44@@ -214,11 +213,9 @@
45 length += 1
46
47 if length:
48- self.show_all()
49- self.props.no_show_all = False
50+ self.get_parent().show()
51 else:
52- self.hide()
53- self.props.no_show_all = True
54+ self.get_parent().hide()
55
56 def SelectionChanged(self, selection):
57 if self.SelectionHandler is None:
58@@ -1647,6 +1644,7 @@
59 self._categories[category] = []
60 self._categories[category].append(plugin)
61
62+ self.set_shadow_type (Gtk.ShadowType.IN)
63 self.props.hscrollbar_policy = Gtk.PolicyType.NEVER
64 self.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC
65 self.connect ('size-allocate', self.on_size_allocate)
66@@ -1665,6 +1663,7 @@
67 self._box.pack_start (category_box, False, False, 0)
68
69 viewport = Gtk.Viewport ()
70+ viewport.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW)
71 viewport.set_focus_vadjustment (self.get_vadjustment ())
72 viewport.add (self._box)
73 self.add (viewport)

Subscribers

People subscribed via source and target branches