diff options
-rw-r--r-- | src/gmdocument.c | 25 | ||||
-rw-r--r-- | src/ui/color.c | 4 | ||||
-rw-r--r-- | src/ui/documentwidget.c | 5 |
3 files changed, 8 insertions, 26 deletions
diff --git a/src/gmdocument.c b/src/gmdocument.c index 368aed37..eb60c9db 100644 --- a/src/gmdocument.c +++ b/src/gmdocument.c | |||
@@ -762,31 +762,12 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) { | |||
762 | else if (i == tmHeading3_ColorId) { | 762 | else if (i == tmHeading3_ColorId) { |
763 | color.lum *= 0.75f; | 763 | color.lum *= 0.75f; |
764 | } | 764 | } |
765 | #if 0 | ||
766 | else if (isLink_ColorId(i)) { | ||
767 | /* Darken links generally to improve visibility against a | ||
768 | light background. */ | ||
769 | color.lum *= 0.5f; | ||
770 | color.sat = 1.0f; | ||
771 | } | ||
772 | #endif | ||
773 | else if (i == tmBannerIcon_ColorId || i == tmBannerTitle_ColorId) { | 765 | else if (i == tmBannerIcon_ColorId || i == tmBannerTitle_ColorId) { |
774 | if (isBannerLighter) { | 766 | color.sat = 1.0f; |
775 | color.lum *= 0.75f; | 767 | color.lum = 0.3f; |
776 | } | ||
777 | else { | ||
778 | color.lum = 0.98f; | ||
779 | } | ||
780 | } | 768 | } |
781 | else if (i == tmBannerBackground_ColorId) { | 769 | else if (i == tmBannerBackground_ColorId) { |
782 | if (isBannerLighter) { | 770 | color = hsl_Color(get_Color(tmBackground_ColorId)); |
783 | //color.lum = iMin(0.9, color.lum); | ||
784 | color = hsl_Color(get_Color(tmBackground_ColorId)); | ||
785 | } | ||
786 | else { | ||
787 | color.sat *= 0.8f; | ||
788 | color.lum = 0.6f; | ||
789 | } | ||
790 | } | 771 | } |
791 | else if (isText_ColorId(i)) { | 772 | else if (isText_ColorId(i)) { |
792 | color.sat = 0.9f; | 773 | color.sat = 0.9f; |
diff --git a/src/ui/color.c b/src/ui/color.c index 221a7c2a..dcdc5788 100644 --- a/src/ui/color.c +++ b/src/ui/color.c | |||
@@ -196,7 +196,7 @@ void setThemePalette_Color(enum iColorTheme theme) { | |||
196 | copy_(uiAnnotation_ColorId, gray50_ColorId); | 196 | copy_(uiAnnotation_ColorId, gray50_ColorId); |
197 | copy_(uiIcon_ColorId, brown_ColorId); | 197 | copy_(uiIcon_ColorId, brown_ColorId); |
198 | copy_(uiIconHover_ColorId, brown_ColorId); | 198 | copy_(uiIconHover_ColorId, brown_ColorId); |
199 | copy_(uiSeparator_ColorId, gray25_ColorId); | 199 | copy_(uiSeparator_ColorId, gray50_ColorId); |
200 | copy_(uiMarked_ColorId, cyan_ColorId); | 200 | copy_(uiMarked_ColorId, cyan_ColorId); |
201 | copy_(uiMatching_ColorId, orange_ColorId); | 201 | copy_(uiMatching_ColorId, orange_ColorId); |
202 | break; | 202 | break; |
@@ -238,7 +238,7 @@ void setThemePalette_Color(enum iColorTheme theme) { | |||
238 | copy_(uiAnnotation_ColorId, gray50_ColorId); | 238 | copy_(uiAnnotation_ColorId, gray50_ColorId); |
239 | copy_(uiIcon_ColorId, brown_ColorId); | 239 | copy_(uiIcon_ColorId, brown_ColorId); |
240 | copy_(uiIconHover_ColorId, brown_ColorId); | 240 | copy_(uiIconHover_ColorId, brown_ColorId); |
241 | copy_(uiSeparator_ColorId, gray50_ColorId); | 241 | copy_(uiSeparator_ColorId, gray75_ColorId); |
242 | copy_(uiMarked_ColorId, cyan_ColorId); | 242 | copy_(uiMarked_ColorId, cyan_ColorId); |
243 | copy_(uiMatching_ColorId, orange_ColorId); | 243 | copy_(uiMatching_ColorId, orange_ColorId); |
244 | break; | 244 | break; |
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c index ed6c2518..a36fe761 100644 --- a/src/ui/documentwidget.c +++ b/src/ui/documentwidget.c | |||
@@ -1267,14 +1267,15 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e | |||
1267 | "scroll.page arg:%d", | 1267 | "scroll.page arg:%d", |
1268 | (key == SDLK_SPACE && mods & KMOD_SHIFT) || key == SDLK_PAGEUP ? -1 : +1); | 1268 | (key == SDLK_SPACE && mods & KMOD_SHIFT) || key == SDLK_PAGEUP ? -1 : +1); |
1269 | return iTrue; | 1269 | return iTrue; |
1270 | #if 0 | 1270 | #if 1 |
1271 | case SDLK_9: { | 1271 | case SDLK_KP_1: { |
1272 | iBlock *seed = new_Block(64); | 1272 | iBlock *seed = new_Block(64); |
1273 | for (size_t i = 0; i < 64; ++i) { | 1273 | for (size_t i = 0; i < 64; ++i) { |
1274 | setByte_Block(seed, i, iRandom(0, 255)); | 1274 | setByte_Block(seed, i, iRandom(0, 255)); |
1275 | } | 1275 | } |
1276 | setThemeSeed_GmDocument(d->doc, seed); | 1276 | setThemeSeed_GmDocument(d->doc, seed); |
1277 | delete_Block(seed); | 1277 | delete_Block(seed); |
1278 | invalidate_DocumentWidget_(d); | ||
1278 | refresh_Widget(w); | 1279 | refresh_Widget(w); |
1279 | break; | 1280 | break; |
1280 | } | 1281 | } |