Fix #107499: Text Object Selection with Scale To Fit Mode #107510

Harley Acheson · 2023-05-01T20:15:26+02:00

Harley Acheson commented

2023-05-01 20:15:26 +02:00

Allow mouse text selection and cursor positioning to work correctly
when the text box has overflow mode set to "Scale to Fit."

This moves the "cursor_params" code so that it happens after text-box scaling is done. Because this code now scales by scale_to_fit it also does so by cu->fsize too. Therefore the scaling of mouse position by font size in font_cursor_text_index_from_event is removed.

Allow mouse text selection and cursor positioning to work correctly when the text box has overflow mode set to "Scale to Fit." --- This moves the "cursor_params" code so that it happens after text-box scaling is done. Because this code now scales by scale_to_fit it also does so by cu->fsize too. Therefore the scaling of mouse position by font size in font_cursor_text_index_from_event is removed.

Harley Acheson requested review from Campbell Barton 2023-05-01 20:15:44 +02:00

Harley Acheson added this to the User Interface project 2023-05-02 00:09:23 +02:00

Campbell Barton approved these changes 2023-05-02 03:10:19 +02:00

Campbell Barton left a comment

Accepting with minor request.

source/blender/blenkernel/intern/vfont.c Outdated

						
				@ -1766,1 +1737,4 @@

				  if (cursor_params) {

				    float scale = cu->fsize * iter_data->scale_to_fit;

Campbell Barton commented

2023-05-02 03:10:06 +02:00

This looks to be assigned a variable already, see: font_size.

This looks to be assigned a variable already, see: `font_size`.

Harley marked this conversation as resolved

Harley Acheson commented

2023-05-02 18:09:59 +02:00

@ideasman42 - This looks to be assigned a variable already, see: font_size.

Yes, I had seen that but had (wrongly) thought it not useful for this. It is assigned at the beginning of the function and not updated yet its constituents change. So during an iterative sizing it is only correct on the last pass. But mine was no better, only having the correct value just before that last pass. In the end they are both the same so just used font_size as that looks less confusing. Thanks!

> @ideasman42 - This looks to be assigned a variable already, see: font_size. Yes, I had seen that but had (wrongly) thought it not useful for this. It is assigned at the beginning of the function and not updated yet its constituents change. So during an iterative sizing it is only correct on the last pass. But mine was no better, only having the correct value just _before_ that last pass. In the end they are both the same so just used `font_size` as that looks less confusing. Thanks!

Harley Acheson force-pushed VfontFit from db47a59eda to bad4fdf34c

2023-05-02 18:37:26 +02:00

Compare

Harley Acheson commented

2023-05-02 18:41:36 +02:00

@blender-bot build

Harley Acheson added 1 commit 2023-05-02 19:05:34 +02:00

a213a992c4 Unused variable

Harley Acheson merged commit 22245115fd into main

2023-05-02 19:32:53 +02:00

Harley Acheson deleted branch VfontFit

2023-05-02 19:32:54 +02:00