isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

js: Use generic actor properties to align StBin children

Browse Source 
StBin's fill/align properties are now no-ops; get back the intended
child allocation by setting the corresponding x/y-align on the child.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/803
This commit is contained in:
Florian Müllner
2019-10-17 23:40:24 +02:00
parent 72af64d964
commit f2bd39b20c
25 changed files with 155 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
js/ui/search.js
View File

@ -43,8 +43,6 @@ class SearchResult extends St.Button {
reactive: true,
can_focus: true,
track_hover: true,
x_align: St.Align.START,
y_fill: true
});
}
@ -68,12 +66,13 @@ class ListSearchResult extends SearchResult {
super._init(provider, metaInfo, resultsView);
this.style_class = 'list-search-result';
this.x_fill = true;
let content = new St.BoxLayout({
style_class: 'list-search-result-content',
vertical: false,
x_align: Clutter.ActorAlign.START,
x_expand: true,
y_expand: true,
});
this.set_child(content);
@ -142,7 +141,12 @@ class GridSearchResult extends SearchResult {
this.icon = new IconGrid.BaseIcon(this.metaInfo['name'],
{ createIcon: this.metaInfo['createIcon'] });
let content = new St.Bin({ child: this.icon });
let content = new St.Bin({
child: this.icon,
x_align: Clutter.ActorAlign.START,
x_expand: true,
y_expand: true,
});
this.set_child(content);
this.label_actor = this.icon.label;
}
@ -166,7 +170,7 @@ var SearchResultsBase = GObject.registerClass({
this._terms = [];
this._focusChild = null;
this._resultDisplayBin = new St.Bin({ x_fill: true });
this._resultDisplayBin = new St.Bin();
this.add_child(this._resultDisplayBin);
let separator = new St.Widget({ style_class: 'search-section-separator' });
@ -353,7 +357,7 @@ class GridSearchResults extends SearchResultsBase {
this._grid = new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS,
xAlign: St.Align.START });
this._bin = new St.Bin({ x_align: St.Align.MIDDLE });
this._bin = new St.Bin({ x_align: Clutter.ActorAlign.CENTER });
this._bin.set_child(this._grid);
this._resultDisplayBin.set_child(this._bin);
@ -427,8 +431,11 @@ var SearchResultsView = GObject.registerClass({
_init() {
super._init({ name: 'searchResults', vertical: true });
this._content = new MaxWidthBox({ name: 'searchResultsContent',
vertical: true });
this._content = new MaxWidthBox({
name: 'searchResultsContent',
vertical: true,
x_expand: true,
});
this._scrollView = new St.ScrollView({
overlay_scrollbars: true,