Skip to content

Commit 9a306e4

Browse files
committed
more fixes
1 parent a928b31 commit 9a306e4

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

files/usr/share/cinnamon/applets/[email protected]/applet.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ const REMEMBER_RECENT_KEY = 'remember-recent-files';
2828
const SEARCH_THRESHOLD = 0.45;
2929
const SidebarPlacement = Object.freeze({TOP: 0, BOTTOM: 1, LEFT: 2, RIGHT: 3});
3030

31-
/*This graph shows the classes in which other classes are instantiated.
31+
/* This graph shows the classes in which other classes are instantiated and how they are
32+
* acessed. e.g. to call the update() method in categoriesView from contextMenu class use:
33+
* this.appThis.display.categoriesView.update()
34+
3235
┌── class AppsView ───────┬── class AppButton
3336
│ └── class Subheading
3437
@@ -438,7 +441,9 @@ class CinnamenuApplet extends TextIconApplet {
438441
openOnCategory = 'places';
439442
}
440443

441-
this.display.updateMenuSize();
444+
if (!this.resizer._size_restricted) {
445+
this.display.updateMenuSize();
446+
}
442447
this.setActiveCategory(openOnCategory);
443448

444449
//Show panel when auto hide is on.
@@ -1056,8 +1061,7 @@ class CinnamenuApplet extends TextIconApplet {
10561061
try {
10571062
ans = eval?.(`"use strict"; ${exp}`);
10581063
} catch(e) {
1059-
const r = /[\(\)\+=/\*\.;,]/
1060-
const probablyMath = r.test(exp);
1064+
const probablyMath = /[\(\)\+=/\*]/.test(exp);
10611065
if (probablyMath) {
10621066
calculatorResult = _("Calculator: ") + e.message;
10631067
}
@@ -1170,6 +1174,7 @@ class CinnamenuApplet extends TextIconApplet {
11701174
if (FILE_SEARCH_DEBUG) {
11711175
log("searching: " + folder);
11721176
}
1177+
11731178
dir.enumerate_children_async('standard::name,standard::type,standard::is-symlink',
11741179
Gio.FileQueryInfoFlags.NONE, GLib.PRIORITY_DEFAULT, null, (source, result) => {
11751180
try {
@@ -1240,7 +1245,7 @@ class CinnamenuApplet extends TextIconApplet {
12401245
}//end if
12411246

12421247
if (FILE_SEARCH_DEBUG) {
1243-
log ("todo: " + foldersToDo.length + " done: " + foldersSearched + " time: " + (Date.now() - timer) + " : total " + (Date.now() - total_timer));
1248+
log("todo: " + foldersToDo.length + " done: " + foldersSearched + " time: " + (Date.now() - timer) + " : total " + (Date.now() - total_timer));
12441249
}
12451250
//update display of results at intervals or when search completed
12461251
if (foldersToDo.length === 0 || Date.now() - lastUpdateTime > updateInterval) {

files/usr/share/cinnamon/applets/[email protected]/emoji.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//This list is taken from https://unicode.org/emoji/charts/emoji-list.html
2-
//Emoji List, v15.1
2+
//Emoji List, v16.0
33

44
//Additional keywords are from emojilib (https://github.com/muan/emojilib) License: MIT
55

files/usr/share/cinnamon/applets/[email protected]/stylesheet.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@
3434
padding: 10px 2px;
3535
}
3636

37-
.menu-applications-grid-box .menu-application-button-label {
37+
.menu-applications-grid-box .menu-application-button-label,
38+
.menu-applications-grid-box .menu-application-button-label:ltr,
39+
.menu-applications-grid-box .menu-application-button-label:rtl {
3840
text-align: center;
41+
padding-left: 0px;
42+
padding-right: 0px;
3943
}
4044

4145
.gridmenu .menu-categories-box {

0 commit comments

Comments
 (0)