diff options
| author | csaba <csaba> | 2023-03-03 18:35:15 (GMT) |
|---|---|---|
| committer | csaba <csaba> | 2023-03-03 18:35:15 (GMT) |
| commit | 9baa9e4e8d5bc0b13e50aee748da41fc8a0685d7 (patch) | |
| tree | 6e6759ab5f6587e989a372c012f652f2862ba28a /generic | |
| parent | d6e7246b215b507e14e2653aaeaa12804a31166b (diff) | |
| download | tk-9baa9e4e8d5bc0b13e50aee748da41fc8a0685d7.zip tk-9baa9e4e8d5bc0b13e50aee748da41fc8a0685d7.tar.gz tk-9baa9e4e8d5bc0b13e50aee748da41fc8a0685d7.tar.bz2 | |
Helper function ColorToStr() greatly simplified.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkClamTheme.c | 7 | ||||
| -rw-r--r-- | generic/ttk/ttkDefaultTheme.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c index dccefc2..de24d8c 100644 --- a/generic/ttk/ttkClamTheme.c +++ b/generic/ttk/ttkClamTheme.c @@ -397,11 +397,8 @@ static void IndicatorElementSize( static void ColorToStr( const XColor *colorPtr, char *colorStr) /* in the format "RRGGBB" */ { - char str[13]; - - snprintf(str, sizeof(str), "%04x%04x%04x", - colorPtr->red, colorPtr->green, colorPtr->blue); - snprintf(colorStr, 7, "%.2s%.2s%.2s", str, str + 4, str + 8); + snprintf(colorStr, 7, "%02x%02x%02x", + colorPtr->red >> 8, colorPtr->green >> 8, colorPtr->blue >> 8); } static void ImageChanged( /* to be passed to Tk_GetImage() */ diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c index aad519e..0a1afa5 100644 --- a/generic/ttk/ttkDefaultTheme.c +++ b/generic/ttk/ttkDefaultTheme.c @@ -507,11 +507,8 @@ static void IndicatorElementSize( static void ColorToStr( const XColor *colorPtr, char *colorStr) /* in the format "RRGGBB" */ { - char str[13]; - - snprintf(str, sizeof(str), "%04x%04x%04x", - colorPtr->red, colorPtr->green, colorPtr->blue); - snprintf(colorStr, 7, "%.2s%.2s%.2s", str, str + 4, str + 8); + snprintf(colorStr, 7, "%02x%02x%02x", + colorPtr->red >> 8, colorPtr->green >> 8, colorPtr->blue >> 8); } static void ImageChanged( /* to be passed to Tk_GetImage() */ |