Commit Graph
309 Commits
Author SHA1 Message Date
Harishankar Kumar 283b5c4b20 GRAPHICS: MACGUI: Fix kMacRoman fonts issues with special characters
This commit removes Mac Roman from plainByteMode(), this partially
reverts commit `9d4ac18be542eed5fdbb52519fd95ea7ac47a9e4` from
PR #3823, this change breaks Hebrew rendering in Pink.

Fixes rendering of texts in `theapartment` using MacRoman fonts.
2023-06-21 20:18:39 +03:00
Harishankar Kumar b7e09d8259 GRAPHICS: MACGUI: Fix alignment issues for multiline text
This patch fixes the alignment issue for multiline text in text castMember
it increases the line height of each line by one, this added change over
multiple lines result in fixed alignment. This patch also removes the height
reduction due to empty line (which cumulatively caused the alignment issue).

`DATA/SUPPORT/INTRODUCTION@111` of 'warlock-100' has this alignment issue
where the text "The Blaster" was above the button it was supposed to be.
2023-06-21 20:18:39 +03:00
Scott Percival 14c7756d06 GRAPHICS: MACGUI: Fix edge cases of getMouseWord 2023-03-24 21:27:34 +01:00
Roland van Laar 157b1d9a48 GRAPHICS: MACGUI: keep formatting in empty text
When text is emptied by user action, e.g. backspace, the formattting
should be preserved.

In the game Majestic a text box for user input would start out with the
correct formatting, i.e. green text on a black background. When the user
would then press backspace till the text was gone, the method
`MacText::getTextChunk` would return an empty string, with the
formatting removed. If the user started typing again the text would use
the default formatting with black text on black background.

Fixes: https://trello.com/c/POQZRCEO/546-text-doesnt-show-in-majestic-in-text-box
2023-02-17 15:02:52 +01:00
Roland van Laar d33005f8b2 JANITORIAL: GRAPHICS: print fgcolor in base 10
All colors in debug output in mactext use base 10
where this line was in base 16.
2023-02-17 15:02:52 +01:00
Eugene Sandulenko e5c1ef3fbb DIRECTOR: Fix regression from 48740a2ad1
The color values went inverted, but in several places they left
untouched.

In general, it is not a good idea to have this hardcoded, but at least
now we have this addressed.
2023-02-10 00:53:38 +01:00
elasota 261ced8ca4 GRAPHICS: Fix getRowCol returning uninitialized variable nsx if there were no chunks for the chosen line. 2022-11-28 18:43:55 +01:00
Hubert Maier a3ec89bf51 JANITORIAL: GRAPHICS: Correct Spelling Mistake
begining -> beginning
2022-11-15 22:52:43 +02:00
Hubert Maier 072a3b2958 GRAPHICS: Correct spelling mistake
begining -> beginning
2022-10-27 15:56:06 +02:00
Eugene Sandulenko b697ad6cfa GRAPHICS: MACGUI: Improved debug output 2022-08-22 17:39:47 +02:00
Eugene Sandulenko ba4a260e9e GRAPHICS: MACGUI: Use uint32 for color information 2022-08-20 22:12:29 +02:00
Avijeet a21afb29b1 GRAPHICS: MACGUI: Reduce duplicated code in MacTect::render 2022-08-05 20:17:23 +02:00
Avijeet ff1f5712e3 PINK: Fix reversed hebrew text 2022-08-05 20:17:23 +02:00
Pragyansh Chaturvedi 94848be816 GRAPHICS: Set MacText->_defaultFormatting values after generating font 2022-07-17 13:04:14 +02:00
Avijeet 7beaa38ef6 COMMON: MACGUI: Append string with font in appendText 2022-07-02 22:41:36 +02:00
Pragyansh Chaturvedi (r41k0u) 8409314414 DIRECTOR: LINGO: Implement MacText::enforceFontSlant() and implement kTheTextStyle STUB in TextCastMember::setField() 2022-06-06 18:32:14 +02:00
Pragyansh Chaturvedi (r41k0u) 334bbd11a3 DIRECTOR: LINGO: Implement MacText::enforceTextFont() and use it to implement STUB kTheTextFont in TextCastMember::setField() 2022-06-06 18:32:14 +02:00
Pragyansh Chaturvedi (r41k0u) 26779bbd1d DIRECTOR: Revert _ptext change check omission in TextCastMember::setText(), remove unnecessary initialisation of string in MacText::getPlainText() 2022-06-06 18:32:14 +02:00
Pragyansh Chaturvedi (r41k0u) 0a95714cac DIRECTOR: GRAPHICS: Add getPlainText() function to MacText 2022-06-06 18:32:14 +02:00
Quote58 9d4ac18be5 COMMON: macText::plainByteMode() accounts for Mac Roman. 2022-04-18 16:26:57 +03:00
Eugene Sandulenko abea37c9bb ALL: Update ScummVM project license to GPLv3+ 2021-12-26 18:48:43 +01:00
ysj1173886760 83615f0d86 GRAPHICS: MACGUI: fix text display issue in mactextwindow. 2021-09-06 20:58:53 +08:00
ysj1173886760 69cb4dd7a9 GRAPHICS: MACGUI: fix rendering text. 2021-08-18 21:06:41 +08:00
ysj1173886760 d00c5d1c36 DIRECTOR: fix _interLinear in mactext.
looks like it's the max text height, instead of the height of intervals of line.
2021-08-13 20:27:18 +08:00
ysj1173886760 e5af48a2ac GRAPHICS: MACGUI: fix getRowCol.
deal with out of bound error.
2021-08-12 17:03:09 +08:00
Thierry Crozat bb98ce92f2 MACGUI: Explicitly use ellipsis to draw text when needed
This is the default, so this commit does not change the behaviour.
But this will allow to change the default at a later stage.
2021-08-01 17:22:13 +02:00
ysj1173886760 9148f6dd20 GRAPHICS: MACGUI: fix the behaviour of drawing selection 2021-07-31 18:23:47 +08:00
ysj1173886760 b60bcbfef7 GRAPHICS: MACGUI: implement getMouseLine 2021-07-31 15:52:41 +08:00
ysj1173886760 9ba14cf696 GRAPHICS: MACGUI: implement getMouseWord 2021-07-31 15:46:50 +08:00
ysj1173886760 87cd99126a GRAPHICS: MACGUI: implement getMouseWord 2021-07-30 16:38:15 +08:00
ysj1173886760 b1f5de3501 GRAPHICS: MACGUI: implement mouseChar 2021-07-30 16:25:51 +08:00
ysj1173886760 948604d79d GRAPHICS: MACGUI: text length should not bigger than maxWidth - 1 2021-07-29 12:04:20 +08:00
ysj1173886760 e4762aef5e DIRECTOR: don't scroll for auto expand text. 2021-07-26 17:10:10 +08:00
ysj1173886760 bd6f680648 GRAPHICS: MACGUI: fix rendering text.
previously, it will blink due to i was using transBlitFrom to blit text to composed surface.
for now, i've fixed the render logic, this should behave correct and more faster than ever.
2021-07-26 14:31:57 +08:00
ysj1173886760 70e2ca433c GRAPHICS: MACGUI: fix rendering text shadow with non-black text. 2021-07-24 15:10:13 +08:00
ysj1173886760 0f6c0f0904 GRAPHICS: MACGUI: clean the formats in mactext 2021-07-23 17:06:38 +08:00
djsrv c4626eef97 GRAPHICS: MACGUI: Fix compilation
Forgot to eliminate new uses of _encodeType when rebasing. As formatting
strings only use ASCII characters the encoding shouldn't really matter,
and using the default of UTF-8 is easier than fetching the actual
encoding from the relevant MacTextRun.
2021-07-12 00:54:37 -04:00
djsrv 5bc3ad06c0 GRAPHICS: MACGUI: Move encoding tracking to MacFontRun
Font is basically the only way to determine a piece of text's encoding
in Director. Since MacFontRun tracks fonts, it's the nicest place to
handle encoding too.
2021-07-12 00:38:05 -04:00
ysj1173886760 c6bd9f908f GRAPHICS: MACGUI: fixing mactext for dealing with fg color 2021-07-09 19:48:37 +08:00
ysj1173886760 f4a2b8b963 GRAPHICS: MACGUI: amend drawing color 2021-07-09 19:48:37 +08:00
ysj1173886760 947764159c DIRECTOR: fix rendering text separately. read fg color though text, instead of argument 2021-07-09 09:41:31 +08:00
ysj1173886760 4c9db11696 GRAPHICS: MACGUI: amend setting bgcolor and fgcolor. drawing color by fgcolor 2021-07-09 09:41:31 +08:00
ysj1173886760 dc41917a74 DIRECTOR: implement text chunk fields operations 2021-07-08 02:25:11 +02:00
ysj1173886760 6e2a8fc08f GRAPHICS: MACGUI: implement setting text slant and text fontId of text chunks 2021-07-08 02:25:11 +02:00
ysj1173886760 42aa4739f8 DIRECTOR: implement chunk field operations for text cast member 2021-07-08 02:25:11 +02:00
ysj1173886760 56fad1585b DIRECTOR: implement setting text size for text cast member 2021-07-08 02:25:11 +02:00
ysj1173886760 1492a06a84 GRAPHICS: MACGUI: amend interLinear for mactext 2021-07-08 02:25:11 +02:00
ysj1173886760 60c0e78d95 GRAPHICS: MACGUI: add line spacing for mactext 2021-07-08 02:25:11 +02:00
djsrv e9d9b9f569 DIRECTOR: Revert FXmp handling
This reverts commit 4dabee7e8b.
This reverts commit 3fda461d5f.
This reverts commit 831c014f9e.
This reverts commit b3b55e59e9.
2021-07-06 16:47:20 -04:00
djsrv 3fda461d5f GRAPHICS: MACGUI: Handle FontXPlatformMap in MacFontManager::getFont 2021-07-05 22:54:14 -04:00