From 25af738762fc0c5e0136e21d844a8b75540491a8 Mon Sep 17 00:00:00 2001
From: Maganty Rushyendra <mrushyendra@yahoo.com.sg>
Date: Wed, 27 May 2020 17:21:35 +0800
Subject: [PATCH] Expose `get_char_size()` from Font instead of BitmapFont

`get_char_size()` is a public virtual function defined in the `Font`
class. Implementations exist for both `BitmapFont` and `Dynamic Font`.
However, it was only exposed to the GDScript API through the Bitmap
Font, and not for Dynamic Font.

This commit exposes the function through `Font` instead.

Fixes #23967

(cherry picked from commit a4413710f9418bd5a5ab83ac3ed70b1329cb2492)
---
 doc/classes/BitmapFont.xml | 11 -----------
 doc/classes/Font.xml       | 11 +++++++++++
 scene/resources/font.cpp   |  3 +--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/doc/classes/BitmapFont.xml b/doc/classes/BitmapFont.xml
index 7cd4bd215c0..6c53760db84 100644
--- a/doc/classes/BitmapFont.xml
+++ b/doc/classes/BitmapFont.xml
@@ -65,17 +65,6 @@
 				Creates a BitmapFont from the [code]*.fnt[/code] file at [code]path[/code].
 			</description>
 		</method>
-		<method name="get_char_size" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<argument index="0" name="char" type="int">
-			</argument>
-			<argument index="1" name="next" type="int" default="0">
-			</argument>
-			<description>
-				Returns the size of a character, optionally taking kerning into account if the next character is provided.
-			</description>
-		</method>
 		<method name="get_kerning_pair" qualifiers="const">
 			<return type="int">
 			</return>
diff --git a/doc/classes/Font.xml b/doc/classes/Font.xml
index c34fd3bdbbc..0de63a8ba58 100644
--- a/doc/classes/Font.xml
+++ b/doc/classes/Font.xml
@@ -54,6 +54,17 @@
 				Returns the font ascent (number of pixels above the baseline).
 			</description>
 		</method>
+		<method name="get_char_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="char" type="int">
+			</argument>
+			<argument index="1" name="next" type="int" default="0">
+			</argument>
+			<description>
+				Returns the size of a character, optionally taking kerning into account if the next character is provided.
+			</description>
+		</method>
 		<method name="get_descent" qualifiers="const">
 			<return type="float">
 			</return>
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 19c59b38176..18e74583163 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -95,6 +95,7 @@ void Font::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_descent"), &Font::get_descent);
 	ClassDB::bind_method(D_METHOD("get_height"), &Font::get_height);
 	ClassDB::bind_method(D_METHOD("is_distance_field_hint"), &Font::is_distance_field_hint);
+	ClassDB::bind_method(D_METHOD("get_char_size", "char", "next"), &Font::get_char_size, DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("get_string_size", "string"), &Font::get_string_size);
 	ClassDB::bind_method(D_METHOD("get_wordwrap_string_size", "string", "width"), &Font::get_wordwrap_string_size);
 	ClassDB::bind_method(D_METHOD("has_outline"), &Font::has_outline);
@@ -606,8 +607,6 @@ void BitmapFont::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_texture_count"), &BitmapFont::get_texture_count);
 	ClassDB::bind_method(D_METHOD("get_texture", "idx"), &BitmapFont::get_texture);
 
-	ClassDB::bind_method(D_METHOD("get_char_size", "char", "next"), &BitmapFont::get_char_size, DEFVAL(0));
-
 	ClassDB::bind_method(D_METHOD("set_distance_field_hint", "enable"), &BitmapFont::set_distance_field_hint);
 
 	ClassDB::bind_method(D_METHOD("clear"), &BitmapFont::clear);