pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 3 Pull requests Projects Releases 10 Packages Wiki Activity Actions

better theme

Browse source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@721 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
Nishi 2025-11-14 18:19:07 +00:00
commit 6ebb57a1a2
5 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core.c
View file

@ -280,7 +280,7 @@ int MwStep(MwWidget handle) {
handle->prop_event = 1; handle->prop_event = 1;
clean_destroy_queue(handle); clean_destroy_queue(handle);
if(handle->parent == NULL && handle->destroyed){ if(handle->parent == NULL && handle->destroyed) {
MwFreeWidget(handle); MwFreeWidget(handle);
return 1; return 1;
} }

2
src/default.c
View file

@ -1,7 +1,7 @@
/* $Id$ */ /* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
const char* MwDefaultBackground = "#ddd"; const char* MwDefaultBackground = "#d2d2d2";
const char* MwDefaultForeground = "#000"; const char* MwDefaultForeground = "#000";
const char* MwDefaultDarkBackground = "#333"; const char* MwDefaultDarkBackground = "#333";

21
src/draw.c
View file

@ -13,9 +13,9 @@
static int get_color_diff(MwWidget handle) { static int get_color_diff(MwWidget handle) {
if(MwGetInteger(handle, MwNmodernLook)) { if(MwGetInteger(handle, MwNmodernLook)) {
return 48; return 46;
} else { } else {
return 128; return 96;
} }
} }
@ -127,7 +127,22 @@ void MwDrawRectFading(MwWidget handle, MwRect* rect, MwLLColor color) {
} }
void MwDrawFrame(MwWidget handle, MwRect* rect, MwLLColor color, int invert) { void MwDrawFrame(MwWidget handle, MwRect* rect, MwLLColor color, int invert) {
if(MwGetInteger(handle, MwNmodernLook)) {
MwDrawFrameEx(handle, rect, color, invert, MwDefaultBorderWidth(handle)); MwDrawFrameEx(handle, rect, color, invert, MwDefaultBorderWidth(handle));
} else {
int diff = get_color_diff(handle) / 2;
MwLLColor col = MwLightenColor(handle, color, diff, diff, diff);
if(invert) {
MwDrawFrameEx(handle, rect, col, invert, MwDefaultBorderWidth(handle) / 2);
MwDrawFrameEx(handle, rect, color, invert, MwDefaultBorderWidth(handle) / 2);
} else {
MwDrawFrameEx(handle, rect, color, invert, MwDefaultBorderWidth(handle) / 2);
MwDrawFrameEx(handle, rect, col, invert, MwDefaultBorderWidth(handle) / 2);
}
MwLLFreeColor(col);
}
} }
void MwDrawWidgetBack(MwWidget handle, MwRect* rect, MwLLColor color, int invert, int border) { void MwDrawWidgetBack(MwWidget handle, MwRect* rect, MwLLColor color, int invert, int border) {
@ -215,7 +230,7 @@ void MwDrawDiamond(MwWidget handle, MwRect* rect, MwLLColor color, int invert) {
void MwDrawFrameEx(MwWidget handle, MwRect* rect, MwLLColor color, int invert, int border) { void MwDrawFrameEx(MwWidget handle, MwRect* rect, MwLLColor color, int invert, int border) {
MwPoint p[6]; MwPoint p[6];
int ColorDiff = get_color_diff(handle); int ColorDiff = get_color_diff(handle);
MwLLColor darker = MwLightenColor(handle, color, -ColorDiff, -ColorDiff, -ColorDiff); MwLLColor darker = MwLightenColor(handle, color, -ColorDiff * 3 / 2, -ColorDiff * 3 / 2, -ColorDiff * 3 / 2);
MwLLColor lighter = MwLightenColor(handle, color, ColorDiff, ColorDiff, ColorDiff); MwLLColor lighter = MwLightenColor(handle, color, ColorDiff, ColorDiff, ColorDiff);
p[0].x = rect->x; p[0].x = rect->x;