Cleanup: use 'const' style argument

1 files changed, 10 insertions, 13 deletions

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 3d7378181ad..f4dd114c312 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2848,10 +2848,9 @@ static bool ui_textedit_delete_selection(uiBut *but, uiHandleButtonData *data)
  */
 static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, const float x)
 {
-  uiStyle *style = UI_style_get();  // XXX pass on as arg
-  uiFontStyle *fstyle = &style->widget;
+  /* XXX pass on as arg. */
+  uiFontStyle fstyle = UI_style_get()->widget;
   const float aspect = but->block->aspect;
-  const short fstyle_points_prev = fstyle->points;
 
   float startx = but->rect.xmin;
   float starty_dummy = 0.0f;
@@ -2861,13 +2860,13 @@ static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, con
 
   ui_block_to_window_fl(data->region, but->block, &startx, &starty_dummy);
 
-  ui_fontscale(&fstyle->points, aspect);
+  ui_fontscale(&fstyle.points, aspect);
 
-  UI_fontstyle_set(fstyle);
+  UI_fontstyle_set(&fstyle);
 
-  if (fstyle->kerning == 1) {
+  if (fstyle.kerning == 1) {
     /* for BLF_width */
-    BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+    BLF_enable(fstyle.uifont_id, BLF_KERNING_DEFAULT);
   }
 
   ui_but_text_password_hide(password_str, but, false);
@@ -2889,7 +2888,7 @@ static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, con
     while (i > 0) {
       if (BLI_str_cursor_step_prev_utf8(str, but->ofs, &i)) {
         /* 0.25 == scale factor for less sensitivity */
-        if (BLF_width(fstyle->uifont_id, str + i, (str_last - str) - i) > (startx - x) * 0.25f) {
+        if (BLF_width(fstyle.uifont_id, str + i, (str_last - str) - i) > (startx - x) * 0.25f) {
           break;
         }
       }
@@ -2913,7 +2912,7 @@ static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, con
     but->pos = pos_prev = ((str_last - str) - but->ofs);
 
     while (true) {
-      cdist = startx + BLF_width(fstyle->uifont_id, str + but->ofs, (str_last - str) - but->ofs);
+      cdist = startx + BLF_width(fstyle.uifont_id, str + but->ofs, (str_last - str) - but->ofs);
 
       /* check if position is found */
       if (cdist < x) {
@@ -2945,13 +2944,11 @@ static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, con
     }
   }
 
-  if (fstyle->kerning == 1) {
-    BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+  if (fstyle.kerning == 1) {
+    BLF_disable(fstyle.uifont_id, BLF_KERNING_DEFAULT);
   }
 
   ui_but_text_password_hide(password_str, but, true);
-
-  fstyle->points = fstyle_points_prev;
 }
 
 static void ui_textedit_set_cursor_select(uiBut *but, uiHandleButtonData *data, const float x)