Add Right to Left capability to Telegram for languages like arabic, urdu and persian #24467

AMP999 · 2022-05-01T06:10:14Z

No description provided.

john-preston

Please use comments in the same way the comments appear in existing code:

// This is a comment.
p.thisIsMethod();

Telegram/SourceFiles/dialogs/dialogs_row.cpp

Telegram/SourceFiles/ui/unread_badge.cpp

Telegram/SourceFiles/window/window_connecting_widget.cpp

Signed-off-by: AmirReza_Ashouri <[email protected]>

by adding another parameter with default value of -1 to avoid breaking of the current experience it can adjust position in rtl mode. Signed-off-by: AmirReza_Ashouri <[email protected]>

Signed-off-by: AmirReza_Ashouri <[email protected]>

# Conflicts: # Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp Signed-off-by: AmirReza_Ashouri <[email protected]>

…o rtl-telegram

AMP999 · 2022-05-15T12:00:15Z

Why did snap ubuntu build fail??
@john-preston

AMP999 · 2022-05-18T06:32:19Z

I have resolved issues you mentioned in my code. Is there any problem in my code yet?
Thank you
@john-preston

23rd · 2022-05-18T18:57:58Z

Telegram/SourceFiles/dialogs/dialogs_row.cpp

+	rtl()
+		? p.drawImage(fullWidth - st::dialogsPadding.x() - st::dialogsPhotoSize, st::dialogsPadding.y(), _cornerBadgeUserpic->frame)
+		: p.drawImage(st::dialogsPadding, _cornerBadgeUserpic->frame);


Suggested change

rtl()

? p.drawImage(fullWidth - st::dialogsPadding.x() - st::dialogsPhotoSize, st::dialogsPadding.y(), _cornerBadgeUserpic->frame)

: p.drawImage(st::dialogsPadding, _cornerBadgeUserpic->frame);

p.drawImage(

rtl()

? fullWidth - st::dialogsPadding.x() - st::dialogsPhotoSize

: st::dialogsPadding.x(),

st::dialogsPadding.y(),

_cornerBadgeUserpic->frame);

23rd · 2022-05-18T18:58:49Z

Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp

@@ -77,7 +81,8 @@ void PaintRowDate(Painter &p, QDateTime date, QRect &rectForName, bool active, b
 			return lastDate.toString(cDateFormat());
 		}
 	}();
-	PaintRowTopRight(p, dt, rectForName, active, selected);
+	//paints dialogs last message date on each row
+	PaintRowTopRight(p, dt, rectForName, active, selected, outerw); 


Suggested change

PaintRowTopRight(p, dt, rectForName, active, selected, outerw);

PaintRowTopRight(p, dt, rectForName, active, selected, outerw);

23rd · 2022-05-18T19:00:38Z

Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp

+			(rtl() 
+				? unreadLeft
+				: unreadRight),


Suggested change

(rtl()

? unreadLeft

: unreadRight),

(rtl() ? unreadLeft : unreadRight),

23rd · 2022-05-18T19:01:12Z

Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp

+			(rtl() 
+				? unreadLeft 
+				: unreadRight),


Suggested change

(rtl()

? unreadLeft

: unreadRight),

(rtl() ? unreadLeft : unreadRight),

23rd · 2022-05-18T19:02:39Z

Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp

+			(rtl() 
+				? fullWidth - nameleft - availableWidth 
+				: nameleft),


Suggested change

(rtl()

? fullWidth - nameleft - availableWidth

: nameleft),

(rtl() ? (fullWidth - nameleft - availableWidth) : nameleft),

23rd · 2022-05-18T19:08:57Z

Telegram/SourceFiles/mainwidget.cpp

+			(rtl() 
+				? (width() - _thirdSection->width())
+				: _thirdSection->x()),


Suggested change

(rtl()

? (width() - _thirdSection->width())

: _thirdSection->x()),

(rtl() ? (width() - _thirdSection->width()) : _thirdSection->x()),

23rd · 2022-05-18T19:09:25Z

Telegram/SourceFiles/mainwidget.cpp

+		newWidth = rtl() 
+			? width() - newWidth 
+			: newWidth;


Suggested change

newWidth = rtl()

? width() - newWidth

: newWidth;

newWidth = rtl() ? (width() - newWidth) : newWidth;

23rd · 2022-05-18T19:09:44Z

Telegram/SourceFiles/mainwidget.cpp

+		newWidth = rtl() 
+			? (width() - newWidth) 
+			: newWidth;


Suggested change

newWidth = rtl()

? (width() - newWidth)

: newWidth;

newWidth = rtl() ? (width() - newWidth) : newWidth;

23rd · 2022-05-18T19:14:18Z

Telegram/SourceFiles/ui/unread_badge.cpp

+		auto x = (rtl()
+					? rectForName.right() - qMin(nameWidth + st::dialogsScamSkip, rectForName.width() - width) - width
+					: rectForName.x() + qMin(nameWidth + st::dialogsScamSkip, rectForName.width() - width));


Suggested change

auto x = (rtl()

? rectForName.right() - qMin(nameWidth + st::dialogsScamSkip, rectForName.width() - width) - width

: rectForName.x() + qMin(nameWidth + st::dialogsScamSkip, rectForName.width() - width));

const auto minWidth = std::min(

nameWidth + st::dialogsScamSkip,

rectForName.width() - width);

const auto x = rtl()

? (rectForName.x() + rectForName.width() - minWidth - width)

: (rectForName.x() + minWidth);

23rd · 2022-05-18T19:16:14Z

Telegram/SourceFiles/window/window_connecting_widget.cpp

+		st::connectingLeftShadow.paint(p, right, width());
+		st::connectingLeft.paint(p, right, width());
+		st::connectingRightShadow.paint(p, left, width());
+		st::connectingRight.paint(p, left, width());
+	} else {
+		st::connectingLeftShadow.paint(p, left, width());
+		st::connectingLeft.paint(p, left, width());
+		st::connectingRightShadow.paint(p, right, width());
+		st::connectingRight.paint(p, right, width());


Suggested change

st::connectingLeftShadow.paint(p, right, width());

st::connectingLeft.paint(p, right, width());

st::connectingRightShadow.paint(p, left, width());

st::connectingRight.paint(p, left, width());

} else {

st::connectingLeftShadow.paint(p, left, width());

st::connectingLeft.paint(p, left, width());

st::connectingRightShadow.paint(p, right, width());

st::connectingRight.paint(p, right, width());

st::connectingLeftShadow.paint(p, rtl() ? right : left, width());

st::connectingLeft.paint(p, rtl() ? right : left, width());

st::connectingRightShadow.paint(p, rtl() ? left : right, width());

st::connectingRight.paint(p, rtl() ? left : right, width());

AMP999 force-pushed the rtl-telegram branch from 74a6c8c to 4d7e417 Compare May 2, 2022 12:01

john-preston requested changes May 3, 2022

View reviewed changes

AMP999 added 28 commits May 7, 2022 12:41

fix(dialogs): fix cornerBadge position

f2c5dd0

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix userpic postion when userbadge exists

fb9cd49

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix empty unread badge's position

d683ae0

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix paintRowTopRight to be rtl compatible

b22cd45

by adding another parameter with default value of -1 to avoid breaking of the current experience it can adjust position in rtl mode. Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix last message date position

33c2fe7

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix unread counter and unread mark position

4f7637a

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix pinned icon position

4b63190

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix mention or reaction badge position

4531441

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix drawScamFakeBadge to be rtl compatible

7e70fd1

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix scam badge position

e00a501

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix sender name position in message view

b882976

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix mini image preview position in message view

e6884c1

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix text preview position in message view

def7be6

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix archived chats title's position in collapsed row

7d46366

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix unread message count position in collapsed row

212b04d

Signed-off-by: AmirReza_Ashouri <[email protected]>

docs(dialogs): explain conditions in paintRow

e4726d5

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix topPromotionType position

2afacb0

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix chatTypeIcon position

16b13f2

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix last message summary position

946287b

Signed-off-by: AmirReza_Ashouri <[email protected]>

docs(dialogs): explain hiddenSenderInfo

4c663b4

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix Date position when draft exists

e92da63

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix date position in dialogs

4792d49

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix chat's name position

7784c9b

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(dialogs): fix dialog's name when hidden sender exists

0079c41

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(connecting_widget): fix connecting widget's circle when connected

577a333

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(history): fix history's geometry

1012f89

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(histroy): fix history's resize area geometry

703a91c

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(history): fix history's resize area direction

40bd013

Signed-off-by: AmirReza_Ashouri <[email protected]>

AMP999 added 3 commits May 7, 2022 14:25

fix(third_section): fix third section geometry

d4e819a

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(third_section): fix third section's resize area geometry

e2f14e6

Signed-off-by: AmirReza_Ashouri <[email protected]>

fix(third_section): fix third section's resize direction

dc7e047

Signed-off-by: AmirReza_Ashouri <[email protected]>

AMP999 force-pushed the rtl-telegram branch from 1d26864 to dc7e047 Compare May 7, 2022 10:05

AMP999 requested a review from john-preston May 7, 2022 10:07

AMP999 added 3 commits May 8, 2022 17:41

Merge branch 'dev' into rtl-telegram

77b861e

Merge branch 'dev' into rtl-telegram

159c7b5

# Conflicts: # Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp Signed-off-by: AmirReza_Ashouri <[email protected]>

Merge branch 'rtl-telegram' of https://github.com/AMP999/tdesktop int…

ca8c16b

…o rtl-telegram

This comment was marked as spam.

Sign in to view

23rd reviewed May 18, 2022

View reviewed changes

AMP999 marked this pull request as draft January 6, 2024 13:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Right to Left capability to Telegram for languages like arabic, urdu and persian #24467

Add Right to Left capability to Telegram for languages like arabic, urdu and persian #24467

AMP999 commented May 1, 2022

john-preston left a comment

AMP999 commented May 15, 2022 •

edited

Loading

This comment was marked as spam.

This comment was marked as spam.

AMP999 commented May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

23rd May 18, 2022

	PaintRowTopRight(p, dt, rectForName, active, selected, outerw);
	PaintRowTopRight(p, dt, rectForName, active, selected, outerw);

-		auto x = (rtl()
-					? rectForName.right() - qMin(nameWidth + st::dialogsScamSkip, rectForName.width() - width) - width
-					: rectForName.x() + qMin(nameWidth + st::dialogsScamSkip, rectForName.width() - width));
+		const auto minWidth = std::min(
+			nameWidth + st::dialogsScamSkip,
+			rectForName.width() - width);
+		const auto x = rtl()
+			? (rectForName.x() + rectForName.width() - minWidth - width)
+			: (rectForName.x() + minWidth);

Add Right to Left capability to Telegram for languages like arabic, urdu and persian #24467

Are you sure you want to change the base?

Add Right to Left capability to Telegram for languages like arabic, urdu and persian #24467

Conversation

AMP999 commented May 1, 2022

john-preston left a comment

Choose a reason for hiding this comment

AMP999 commented May 15, 2022 • edited Loading

This comment was marked as spam.

This comment was marked as spam.

AMP999 commented May 18, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AMP999 commented May 15, 2022 •

edited

Loading