diff options
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/root.c | 2 | ||||
-rw-r--r-- | src/ui/text.c | 24 | ||||
-rw-r--r-- | src/ui/window.c | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/ui/root.c b/src/ui/root.c index d847480f..f66e0f29 100644 --- a/src/ui/root.c +++ b/src/ui/root.c | |||
@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ | |||
27 | #include "command.h" | 27 | #include "command.h" |
28 | #include "defs.h" | 28 | #include "defs.h" |
29 | #include "documentwidget.h" | 29 | #include "documentwidget.h" |
30 | #include "embedded.h" | 30 | #include "resources.h" |
31 | #include "inputwidget.h" | 31 | #include "inputwidget.h" |
32 | #include "keys.h" | 32 | #include "keys.h" |
33 | #include "labelwidget.h" | 33 | #include "labelwidget.h" |
diff --git a/src/ui/text.c b/src/ui/text.c index 09c01d46..e762b891 100644 --- a/src/ui/text.c +++ b/src/ui/text.c | |||
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ | |||
23 | #include "text.h" | 23 | #include "text.h" |
24 | #include "color.h" | 24 | #include "color.h" |
25 | #include "metrics.h" | 25 | #include "metrics.h" |
26 | #include "embedded.h" | 26 | #include "resources.h" |
27 | #include "window.h" | 27 | #include "window.h" |
28 | #include "paint.h" | 28 | #include "paint.h" |
29 | #include "app.h" | 29 | #include "app.h" |
@@ -180,21 +180,21 @@ static void init_Font(iFont *d, const iFontSpec *fontSpec, const iFontFile *font | |||
180 | d->data = NULL; | 180 | d->data = NULL; |
181 | d->family = undefined_TextFont; | 181 | d->family = undefined_TextFont; |
182 | /* Note: We only use `family` currently for applying a kerning fix to Nunito. */ | 182 | /* Note: We only use `family` currently for applying a kerning fix to Nunito. */ |
183 | if (data == &fontNunitoRegular_Embedded || | 183 | if (data == &fontNunitoRegular_Resources || |
184 | data == &fontNunitoBold_Embedded || | 184 | data == &fontNunitoBold_Resources || |
185 | data == &fontNunitoExtraBold_Embedded || | 185 | data == &fontNunitoExtraBold_Resources || |
186 | //data == &fontNunitoLightItalic_Embedded || | 186 | //data == &fontNunitoLightItalic_Resources || |
187 | data == &fontNunitoExtraLight_Embedded) { | 187 | data == &fontNunitoExtraLight_Resources) { |
188 | d->family = nunito_TextFont; | 188 | d->family = nunito_TextFont; |
189 | } | 189 | } |
190 | else if (//data == &fontScheherazadeNewRegular_Embedded) { | 190 | else if (//data == &fontScheherazadeNewRegular_Resources) { |
191 | data == &fontNotoSansArabicUIRegular_Embedded) { | 191 | data == &fontNotoSansArabicUIRegular_Resources) { |
192 | d->family = arabic_TextFont; | 192 | d->family = arabic_TextFont; |
193 | } | 193 | } |
194 | else if (data == &fontNotoSansSymbolsRegular_Embedded || | 194 | else if (data == &fontNotoSansSymbolsRegular_Resources || |
195 | data == &fontNotoSansSymbols2Regular_Embedded || | 195 | data == &fontNotoSansSymbols2Regular_Resources || |
196 | data == &fontNotoEmojiRegular_Embedded || | 196 | data == &fontNotoEmojiRegular_Resources || |
197 | data == &fontSmolEmojiRegular_Embedded) { | 197 | data == &fontSmolEmojiRegular_Resources) { |
198 | d->family = emojiAndSymbols_TextFont; | 198 | d->family = emojiAndSymbols_TextFont; |
199 | } | 199 | } |
200 | #endif | 200 | #endif |
diff --git a/src/ui/window.c b/src/ui/window.c index c63ad76a..8016e8ef 100644 --- a/src/ui/window.c +++ b/src/ui/window.c | |||
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ | |||
26 | #include "bookmarks.h" | 26 | #include "bookmarks.h" |
27 | #include "command.h" | 27 | #include "command.h" |
28 | #include "defs.h" | 28 | #include "defs.h" |
29 | #include "embedded.h" | 29 | #include "resources.h" |
30 | #include "keys.h" | 30 | #include "keys.h" |
31 | #include "labelwidget.h" | 31 | #include "labelwidget.h" |
32 | #include "documentwidget.h" | 32 | #include "documentwidget.h" |
@@ -583,7 +583,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) { | |||
583 | #if defined (iPlatformLinux) | 583 | #if defined (iPlatformLinux) |
584 | SDL_SetWindowMinimumSize(d->base.win, minSize.x * d->base.pixelRatio, minSize.y * d->base.pixelRatio); | 584 | SDL_SetWindowMinimumSize(d->base.win, minSize.x * d->base.pixelRatio, minSize.y * d->base.pixelRatio); |
585 | /* Load the window icon. */ { | 585 | /* Load the window icon. */ { |
586 | SDL_Surface *surf = loadImage_(&imageLagrange64_Embedded, 0); | 586 | SDL_Surface *surf = loadImage_(&imageLagrange64_Resources, 0); |
587 | SDL_SetWindowIcon(d->base.win, surf); | 587 | SDL_SetWindowIcon(d->base.win, surf); |
588 | free(surf->pixels); | 588 | free(surf->pixels); |
589 | SDL_FreeSurface(surf); | 589 | SDL_FreeSurface(surf); |
@@ -597,7 +597,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) { | |||
597 | setupUserInterface_MainWindow(d); | 597 | setupUserInterface_MainWindow(d); |
598 | postCommand_App("~bindings.changed"); /* update from bindings */ | 598 | postCommand_App("~bindings.changed"); /* update from bindings */ |
599 | /* Load the border shadow texture. */ { | 599 | /* Load the border shadow texture. */ { |
600 | SDL_Surface *surf = loadImage_(&imageShadow_Embedded, 0); | 600 | SDL_Surface *surf = loadImage_(&imageShadow_Resources, 0); |
601 | d->base.borderShadow = SDL_CreateTextureFromSurface(d->base.render, surf); | 601 | d->base.borderShadow = SDL_CreateTextureFromSurface(d->base.render, surf); |
602 | SDL_SetTextureBlendMode(d->base.borderShadow, SDL_BLENDMODE_BLEND); | 602 | SDL_SetTextureBlendMode(d->base.borderShadow, SDL_BLENDMODE_BLEND); |
603 | free(surf->pixels); | 603 | free(surf->pixels); |
@@ -607,7 +607,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) { | |||
607 | #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME) | 607 | #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME) |
608 | /* Load the app icon for drawing in the title bar. */ | 608 | /* Load the app icon for drawing in the title bar. */ |
609 | if (prefs_App()->customFrame) { | 609 | if (prefs_App()->customFrame) { |
610 | SDL_Surface *surf = loadImage_(&imageLagrange64_Embedded, appIconSize_Root()); | 610 | SDL_Surface *surf = loadImage_(&imageLagrange64_Resources, appIconSize_Root()); |
611 | SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0"); | 611 | SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0"); |
612 | d->appIcon = SDL_CreateTextureFromSurface(d->base.render, surf); | 612 | d->appIcon = SDL_CreateTextureFromSurface(d->base.render, surf); |
613 | free(surf->pixels); | 613 | free(surf->pixels); |