summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Chimento <philip@endlessm.com>2018-04-12 16:13:14 -0700
committerMartin Abente Lahaye <martin.abente.lahaye@gmail.com>2018-04-13 16:41:14 -0400
commit7c9eca9e06c2ecbb2e75426eff3921ed7c9f7fe2 (patch)
tree631e02be7a854e34c85c98215b52e0ef76af17c0
parent061f77411a2ed208a0346765d5b97665f0c5220e (diff)
SearchBox: Don't set width of autocomplete popup
Setting the width here can mean that the popup gets a different width from the search box. Instead, we want it to match the search box's width and ellipsize the label if there's not enough space. https://phabricator.endlessm.com/T20352
-rw-r--r--overrides/endless_private/search_box.js39
1 files changed, 0 insertions, 39 deletions
diff --git a/overrides/endless_private/search_box.js b/overrides/endless_private/search_box.js
index d02462f..afe78ec 100644
--- a/overrides/endless_private/search_box.js
+++ b/overrides/endless_private/search_box.js
@@ -7,17 +7,6 @@ const Pango = imports.gi.Pango;
const BOX_WIDTH_CHARS = 25;
const CELL_PADDING_X = 8;
const CELL_PADDING_Y = 6;
-const SCREEN_RES_WIDTH_TINY = 720;
-const SCREEN_RES_WIDTH_SMALL = 800;
-const SCREEN_RES_WIDTH_MEDIUM = 1024;
-const SCREEN_RES_WIDTH_LARGE = 1366;
-const SCREEN_RES_WIDTH_XL = 1920;
-const TITLE_MAX_CHARS_TINY = 36;
-const TITLE_MAX_CHARS_SMALL = 60;
-const TITLE_MAX_CHARS_MEDIUM = 80;
-const TITLE_MAX_CHARS_LARGE = 100;
-const TITLE_MAX_CHARS_XL = 120;
-const TITLE_MAX_CHARS_DEFAULT = 255;
/**
* Class: SearchBox
@@ -73,7 +62,6 @@ var SearchBox = new Lang.Class({
let cells = this._auto_complete.get_cells();
cells[0].xpad = CELL_PADDING_X;
cells[0].ypad = CELL_PADDING_Y;
- cells[0].width_chars = this._get_title_max_chars();
cells[0].ellipsize = Pango.EllipsizeMode.END;
this._auto_complete.set_match_func(function () { return true; });
@@ -189,31 +177,4 @@ var SearchBox = new Lang.Class({
this._entry_changed_by_widget = true;
this.emit('changed');
},
-
- /*
- * This assumes that the search_box widget is centered in the topbar.
- * Aligning the topbar to any other position may cause this method to not
- * function as expected!
- *
- * The constants used here correspond to the responsive system breakpoints
- * defined by the Design team.
- */
- _get_title_max_chars: function () {
- let screen_width = Gdk.Screen.get_default().get_width();
- let title_max_chars = TITLE_MAX_CHARS_DEFAULT;
-
- if (screen_width <= SCREEN_RES_WIDTH_TINY) {
- title_max_chars = TITLE_MAX_CHARS_TINY;
- } else if (screen_width <= SCREEN_RES_WIDTH_SMALL) {
- title_max_chars = TITLE_MAX_CHARS_SMALL;
- } else if (screen_width <= SCREEN_RES_WIDTH_MEDIUM) {
- title_max_chars = TITLE_MAX_CHARS_MEDIUM;
- } else if (screen_width <= SCREEN_RES_WIDTH_LARGE) {
- title_max_chars = TITLE_MAX_CHARS_LARGE;
- } else if (screen_width <= SCREEN_RES_WIDTH_XL) {
- title_max_chars = TITLE_MAX_CHARS_XL;
- }
-
- return title_max_chars;
- },
});