[gnome-shell/wip/re-search: 450/457] popupMenu: Break separator drawing code out of PopupSeparatorMenuItem
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/re-search: 450/457] popupMenu: Break separator drawing code out of PopupSeparatorMenuItem
- Date: Mon, 8 Oct 2012 15:20:56 +0000 (UTC)
commit 9b9be8088a4bfaab738ceeeae00b5f125d585048
Author: Tanner Doshier <doshitan gmail com>
Date: Wed Aug 15 20:28:49 2012 -0500
popupMenu: Break separator drawing code out of PopupSeparatorMenuItem
https://bugzilla.gnome.org/show_bug.cgi?id=681797
data/theme/gnome-shell.css | 8 ++++++++
js/ui/popupMenu.js | 14 +++++++++++---
js/ui/searchDisplay.js | 4 ++--
3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index aa5d82a..725245b 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -707,6 +707,14 @@ StScrollBar StButton#vhandle:active {
spacing: 16px;
}
+.search-section-separator {
+ -gradient-height: 1px;
+ -gradient-start: rgba(255,255,255,0);
+ -gradient-end: rgba(255,255,255,0.5);
+ -margin-horizontal: 1.5em;
+ height: 1px;
+}
+
.search-section-content {
/* This is the space between the provider icon and the results container */
spacing: 25px;
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 23368a5..26a420f 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -404,9 +404,17 @@ const PopupSeparatorMenuItem = new Lang.Class({
this.parent({ reactive: false,
can_focus: false});
- this._drawingArea = new St.DrawingArea({ style_class: 'popup-separator-menu-item' });
- this.addActor(this._drawingArea, { span: -1, expand: true });
- this._drawingArea.connect('repaint', Lang.bind(this, this._onRepaint));
+ this._separator = new HorzSeparator({ style_class: 'popup-separator-menu-item' });
+ this.addActor(this._separator.actor, { span: -1, expand: true });
+ }
+});
+
+const HorzSeparator = new Lang.Class({
+ Name: 'HorzSeparator',
+
+ _init: function (params) {
+ this.actor = new St.DrawingArea(params);
+ this.actor.connect('repaint', Lang.bind(this, this._onRepaint));
},
_onRepaint: function(area) {
diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index 1ba4dcb..cdb9a8d 100644
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -405,8 +405,8 @@ const SearchDisplay = new Lang.Class({
let providerIcon;
if (!isAppsProvider) {
- let separator = new PopupMenu.PopupSeparatorMenuItem();
- providerBox.add(separator.actor);
+ let separator = new PopupMenu.HorzSeparator({ style_class: 'search-section-separator' });
+ providerBox.add(separator.actor, { expand: true });
providerIcon = new ProviderIcon(provider);
providerIcon.connect('launch-search', Lang.bind(this, function(providerIcon) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]