Skip to content

Commit bc3da6b

Browse files
committed
Merge origin/develop into develop
2 parents 6a8cb8a + bb03b8b commit bc3da6b

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

packages/TelegramClient-UI.package/TCUPollOption.class/instance/initializeWith.and..st

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
as yet unclassified
22
initializeWith: aPollMessage and: anOption
3+
| text |
34

45
pollMessage := aPollMessage.
56
pollOption := anOption.
@@ -9,8 +10,9 @@ initializeWith: aPollMessage and: anOption
910
selectionMorph
1011
color: aPollMessage messageColor;
1112
extent: 16@16.
13+
text := (anOption votePercentage asString),'% ',(anOption text).
1214
textMorph := aPollMessage class defaultTextMorph
13-
contents: (TCUEmojiHelper embedEmojisInto: anOption text);
15+
contents: (TCUEmojiHelper embedEmojisInto: text);
1416
hResizing: #spaceFill;
1517
color: Color white;
1618
margins: aPollMessage class defaultMargins;

packages/TelegramClient-UI.package/TCUPollOption.class/methodProperties.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"new:" : "6/14/2024 00:26:16",
55
"new:with:" : "F.M. 6/5/2024 14:49" },
66
"instance" : {
7-
"initializeWith:" : "6/14/2024 09:29:43",
8-
"initializeWith:and:" : "TU 6/14/2024 00:31",
7+
"initializeWith:" : " 6/21/2024 00:13:40",
8+
"initializeWith:and:" : "TU 6/20/2024 21:56",
99
"mouseDown:" : "TU 6/6/2024 01:46",
10-
"selected" : "6/14/2024 09:29:43",
11-
"selected:" : "6/14/2024 09:29:43",
10+
"selected" : " 6/21/2024 00:13:40",
11+
"selected:" : " 6/21/2024 00:13:40",
1212
"updateSelection" : "TU 6/14/2024 00:29",
1313
"updateText:" : "6/14/2024 09:29:43" } }

packages/TelegramClient-UI.package/TCUStickerWindow.class/methodProperties.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
"buildStickerListItems" : "JK 6/19/2024 11:27",
99
"buildStickerListItemsFor:" : "JK 6/20/2024 12:40",
1010
"close" : "JK 5/29/2024 20:09",
11-
"collectInstalledStickers" : " 6/20/2024 11:30:00",
11+
"collectInstalledStickers" : "6/20/2024 11:30:00",
12+
"convertWebp:" : " 6/21/2024 00:13:58",
1213
"core" : "JK 5/31/2024 14:29",
1314
"core:" : "JK 5/31/2024 14:29",
14-
"downloadStickerSetFrom:" : " 6/20/2024 11:30:00",
15+
"downloadStickerSetFrom:" : "6/20/2024 11:30:00",
1516
"initialize" : "JK 6/20/2024 23:42",
16-
"loadStickers" : " 6/20/2024 11:30:00",
17-
"loadStickersFromStore" : " 6/20/2024 11:30:00",
17+
"loadStickers" : "6/20/2024 11:30:00",
18+
"loadStickersFromStore" : "6/20/2024 11:30:00",
1819
"selectedChat" : "JK 5/28/2024 10:22",
1920
"selectedChat:" : "JK 5/28/2024 10:23",
2021
"selectedSet" : "JK 6/20/2024 11:39",

0 commit comments

Comments
 (0)