Skip to content

replaced use getFont to static version#440

Merged
ABSitf merged 2 commits intomasterfrom
i1028_use_static_getFont
Aug 31, 2022
Merged

replaced use getFont to static version#440
ABSitf merged 2 commits intomasterfrom
i1028_use_static_getFont

Conversation

@ABSitf
Copy link
Contributor

@ABSitf ABSitf commented Aug 31, 2022

replaced getFont to static version
changed getFontSize to static

changed getFontSize to static
MRVIEWER_API ImFont* getFontByType( FontType type ) const;
/// get font size by font type
MRVIEWER_API float getFontSizeByType( FontType type ) const;
static float getFontSizeByType( FontType type );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls restore MRVIEWER_API

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

/// initialize static holder for easier access to ribbon fonts
/// (need to avoid dynamic cast menu to ribbon menu)
void initFontManagerInstance( RibbonFontManager* ribbonFontManager );
static void initFontManagerInstance( RibbonFontManager* ribbonFontManager );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls add MRVIEWER_API

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

void initFontManagerInstance( RibbonFontManager* ribbonFontManager );
static void initFontManagerInstance( RibbonFontManager* ribbonFontManager );

static bool istanceExists() { return getFontManagerInstance_(); };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add comment or remove this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

@ABSitf ABSitf merged commit 9aef5c3 into master Aug 31, 2022
@ABSitf ABSitf deleted the i1028_use_static_getFont branch August 31, 2022 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants