Import Upstream version 3.30.1
Sophie Brun
5 years ago
| 0 | 3.30.1 | |
| 1 | ====== | |
| 2 | * apps-menu: Fix height on HiDPI systems [Florian; #102] | |
| 3 | * window-list: Only switch between windows on active workspace when scrolling | |
| 4 | [Florian; #78] | |
| 5 | ||
| 6 | Contributors: | |
| 7 | Florian Müllner | |
| 8 | ||
| 0 | 9 | 3.30.0 |
| 1 | 10 | ====== |
| 2 | 11 | * Bump version |
| 47 | 47 | padding: 4px 32px; |
| 48 | 48 | @include button(normal); |
| 49 | 49 | &:focus { @include button(focus); } |
| 50 | &:hover { @include button(hover); } | |
| 50 | 51 | &:insensitive { @include button(insensitive); } |
| 51 | 52 | &:active { @include button(active); } |
| 52 | ||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | .modal-dialog-linked-button { |
| 56 | 56 | border-right-width: 1px; |
| 57 | 57 | @include button(normal); |
| 58 | 58 | &:insensitive { @include button(insensitive); } |
| 59 | &:focus { @include button(focus); } | |
| 60 | &:hover { @include button(hover); } | |
| 59 | 61 | &:active { @include button(active); } |
| 60 | &:focus { @include button(focus); } | |
| 61 | 62 | padding: 12px; |
| 62 | 63 | |
| 63 | 64 | &:first-child { |
| 687 | 688 | height: 50px; |
| 688 | 689 | background-color: $selected_bg_color; |
| 689 | 690 | color: $selected_fg_color; |
| 690 | //background-image: url("resource:///org/gnome/shell/theme/ws-switch-arrow-up.png"); | |
| 691 | 691 | background-size: 32px; |
| 692 | 692 | border-radius: 8px; |
| 693 | 693 | } |
| 149 | 149 | // |
| 150 | 150 | // focused button |
| 151 | 151 | // |
| 152 | $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5), | |
| 153 | $osd_bg_color); | |
| 152 | $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3), | |
| 153 | lighten($osd_bg_color,3%)); | |
| 154 | 154 | |
| 155 | 155 | color: $osd_fg_color; |
| 156 | 156 | text-shadow: 0 1px black; |
| 163 | 163 | // active osd button |
| 164 | 164 | // |
| 165 | 165 | $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3), |
| 166 | lighten($osd_bg_color,10%)); | |
| 166 | lighten($osd_bg_color,3%)); | |
| 167 | 167 | |
| 168 | 168 | color: white; |
| 169 | 169 | border-color: $osd_borders_color; |
| 181 | 181 | |
| 182 | 182 | color: white; |
| 183 | 183 | border-color: $osd_borders_color; |
| 184 | background-color: darken($_bg,5%); | |
| 184 | background-color: $selected_bg_color; | |
| 185 | 185 | // This should be none, but it's creating some issues with borders, so to |
| 186 | 186 | // workaround it for now, use inset wich goes through a different code path. |
| 187 | 187 | // see https://bugzilla.gnome.org/show_bug.cgi?id=752934 |
| 684 | 684 | //Load applications |
| 685 | 685 | this._displayButtons(this._listApplications(null)); |
| 686 | 686 | |
| 687 | let height = this.categoriesBox.height + MENU_HEIGHT_OFFSET + 'px'; | |
| 687 | let themeContext = St.ThemeContext.get_for_stage(global.stage); | |
| 688 | let scaleFactor = themeContext.scale_factor; | |
| 689 | let categoriesHeight = this.categoriesBox.height / scaleFactor; | |
| 690 | let height = Math.round(categoriesHeight) + MENU_HEIGHT_OFFSET + 'px'; | |
| 688 | 691 | this.mainBox.style+=('height: ' + height); |
| 689 | 692 | } |
| 690 | 693 |
| 897 | 897 | else |
| 898 | 898 | return; |
| 899 | 899 | |
| 900 | let children = this._windowList.get_children().map(a => a._delegate); | |
| 901 | let active = 0; | |
| 902 | for (let i = 0; i < children.length; i++) { | |
| 903 | if (children[i].active) { | |
| 904 | active = i; | |
| 905 | break; | |
| 906 | } | |
| 907 | } | |
| 908 | ||
| 909 | active = Math.max(0, Math.min(active + diff, children.length-1)); | |
| 910 | children[active].activate(); | |
| 900 | let children = this._windowList.get_children() | |
| 901 | .filter(c => c.visible) | |
| 902 | .map(a => a._delegate); | |
| 903 | let active = children.findIndex(c => c.active); | |
| 904 | let newActive = Math.max(0, Math.min(active + diff, children.length-1)); | |
| 905 | children[newActive].activate(); | |
| 911 | 906 | } |
| 912 | 907 | |
| 913 | 908 | _updatePosition() { |
| 1022 | 1017 | |
| 1023 | 1018 | _removeApp(app) { |
| 1024 | 1019 | let children = this._windowList.get_children(); |
| 1025 | for (let i = 0; i < children.length; i++) { | |
| 1026 | if (children[i]._delegate.app == app) { | |
| 1027 | children[i].destroy(); | |
| 1028 | return; | |
| 1029 | } | |
| 1030 | } | |
| 1020 | let child = children.find(c => c._delegate.app == app); | |
| 1021 | if (child) | |
| 1022 | child.destroy(); | |
| 1031 | 1023 | } |
| 1032 | 1024 | |
| 1033 | 1025 | _onWindowAdded(ws, win) { |
| 1041 | 1033 | return; |
| 1042 | 1034 | |
| 1043 | 1035 | let children = this._windowList.get_children(); |
| 1044 | for (let i = 0; i < children.length; i++) { | |
| 1045 | if (children[i]._delegate.metaWindow == win) | |
| 1046 | return; | |
| 1047 | } | |
| 1036 | if (children.find(c => c._delegate.metaWindow == win)) | |
| 1037 | return; | |
| 1048 | 1038 | |
| 1049 | 1039 | let button = new WindowButton(win, this._perMonitor, this._monitor.index); |
| 1050 | 1040 | this._windowList.layout_manager.pack(button.actor, |
| 1064 | 1054 | return; // not actually removed, just moved to another workspace |
| 1065 | 1055 | |
| 1066 | 1056 | let children = this._windowList.get_children(); |
| 1067 | for (let i = 0; i < children.length; i++) { | |
| 1068 | if (children[i]._delegate.metaWindow == win) { | |
| 1069 | children[i].destroy(); | |
| 1070 | return; | |
| 1071 | } | |
| 1072 | } | |
| 1057 | let child = children.find(c => c._delegate.metaWindow == win); | |
| 1058 | if (child) | |
| 1059 | child.destroy(); | |
| 1073 | 1060 | } |
| 1074 | 1061 | |
| 1075 | 1062 | _onWorkspacesChanged() { |