Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Windows] Always get the non-truncated face name in the style editor and in the font picker #155

Open
wants to merge 1 commit into
base: feature
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/command/edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "../compat.h"
#include "../dialog_search_replace.h"
#include "../dialogs.h"
#include "../font.h"
#include "../format.h"
#include "../include/aegisub/context.h"
#include "../initial_line_state.h"
Expand Down Expand Up @@ -519,8 +520,8 @@ struct edit_font final : public Command {
shift += parsed.set_tag(tag_name, value, norm_sel_start, sel_start + shift);
};

if (font.GetFaceName() != startfont.GetFaceName())
do_set_tag("\\fn", from_wx(font.GetFaceName()));
if (GetFaceName(font) != GetFaceName(startfont))
do_set_tag("\\fn", from_wx(GetFaceName(font)));
if (font.GetPointSize() != startfont.GetPointSize())
do_set_tag("\\fs", std::to_string(font.GetPointSize()));
if (font.GetWeight() != startfont.GetWeight())
Expand Down
5 changes: 2 additions & 3 deletions src/dialog_style_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "dialog_style_editor.h"
#include "dialogs.h"
#include "format.h"
#include "font.h"
#include "help_button.h"
#include "include/aegisub/context.h"
#include "libresrc/libresrc.h"
Expand Down Expand Up @@ -262,9 +263,7 @@ DialogStyleManager::DialogStyleManager(agi::Context *context)
, commit_connection(c->ass->AddCommitListener(&DialogStyleManager::LoadCurrentStyles, this))
, active_line_connection(c->selectionController->AddActiveLineListener(&DialogStyleManager::OnActiveLineChanged, this))
, font_list(std::async(std::launch::async, []() -> wxArrayString {
wxArrayString fontList = wxFontEnumerator::GetFacenames();
fontList.Sort();
return fontList;
return GetFaceNames();
}))
{
using std::bind;
Expand Down
97 changes: 97 additions & 0 deletions src/font.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
// Copyright (c) 2025, arch1t3cht <[email protected]>
//
// Permission to use, copy, modify, and distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
//
// Aegisub Project http://www.aegisub.org/

/// @file font.cpp
/// @brief font face name provider
///


#include "font.h"

#include <wx/fontenum.h>

#ifdef _WIN32
#include <libaegisub/exception.h>
#include <libaegisub/scoped_ptr.h>

#include <Windows.h>
#include <windowsx.h>
#endif


wxArrayString GetFaceNames() {
#ifdef _WIN32

wxArrayString truncated_face_name_list = wxFontEnumerator::GetFacenames();
wxArrayString face_name_list = wxArrayString();
face_name_list.Alloc(truncated_face_name_list.GetCount());

for (const wxString& face_name: truncated_face_name_list) {
wxFont font = wxFont(
10, // Any value would be good
wxFONTFAMILY_DEFAULT,
wxFONTSTYLE_NORMAL,
wxFONTWEIGHT_NORMAL,
false,
face_name
);

face_name_list.Add(GetFaceName(font));

}

face_name_list.Sort();
return face_name_list;

#else

wxArrayString font_list = wxFontEnumerator::GetFacenames();
font_list.Sort();
return font_list;

#endif

}

wxString GetFaceName(const wxFont& font) {
#ifdef _WIN32

HDC dc = CreateCompatibleDC(nullptr);
if (dc == nullptr)
throw agi::EnvironmentError("Failed to initialize the HDC");
agi::scoped_holder<HDC> dc_sh(dc, [](HDC dc) { DeleteDC(dc); });
;
WXHFONT hfont = font.GetHFONT();
SelectFont(dc_sh, hfont);

UINT otm_size = GetOutlineTextMetricsW(dc_sh, 0, nullptr);
if (!otm_size)
throw agi::EnvironmentError("Failed to initialize the otm_size");

OUTLINETEXTMETRICW* otm = reinterpret_cast<OUTLINETEXTMETRICW*>(malloc(otm_size));
agi::scoped_holder<OUTLINETEXTMETRICW*> otm_sh(otm, [](OUTLINETEXTMETRICW* otm) { free(otm); });

otm->otmSize = otm_size;
if (!GetOutlineTextMetricsW(dc_sh, otm_size, otm_sh))
throw agi::EnvironmentError("Failed to initialize the otm");

return reinterpret_cast<wxChar*>(otm) + wxPtrToUInt(otm->otmpFamilyName)/sizeof(wxChar);
#else

return font.GetFaceName();

#endif
}
31 changes: 31 additions & 0 deletions src/font.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Copyright (c) 2025, arch1t3cht <[email protected]>
//
// Permission to use, copy, modify, and distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
//
// Aegisub Project http://www.aegisub.org/

/// @file font.h
/// @see font.cpp
///

#include <wx/string.h>
#include <wx/font.h>

/// @brief Get all the font face name installed in the system.
/// @return A list containing all the font face name sorted
wxArrayString GetFaceNames();

/// @brief Get the font face name.
/// @param font The path to be normalized. It can be a directory or a file.
/// @return The font face name.
wxString GetFaceName(const wxFont& font);
1 change: 1 addition & 0 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ aegisub_src = files(
'fft.cpp',
'fold_controller.cpp',
'font_file_lister.cpp',
'font.cpp',
'frame_main.cpp',
'gl_text.cpp',
'gl_wrap.cpp',
Expand Down
4 changes: 2 additions & 2 deletions src/subs_edit_box.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include "compat.h"
#include "dialog_style_editor.h"
#include "flyweight_hash.h"
#include "font.h"
#include "include/aegisub/context.h"
#include "include/aegisub/hotkey.h"
#include "initial_line_state.h"
Expand Down Expand Up @@ -128,8 +129,7 @@ SubsEditBox::SubsEditBox(wxWindow *parent, agi::Context *context)
style_edit_button = new wxButton(this, -1, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
style_edit_button->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) {
if (active_style) {
wxArrayString font_list = wxFontEnumerator::GetFacenames();
font_list.Sort();
wxArrayString font_list = GetFaceNames();
DialogStyleEditor(this, active_style, c, nullptr, "", font_list).ShowModal();
}
});
Expand Down