Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-14 01:50:25 +00:00
Code Issues Releases Activity

Make sure alignment is disabled when the windowtype is dock

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-12 00:39:50 +01:00
parent b206ecc93d
commit 2c8ef724e6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conky.cc
View File

@ -2943,9 +2943,9 @@ char load_config_file(const char *f)
} }
CONF("alignment") { CONF("alignment") {
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
if (window.type == TYPE_DOCK) if (window.type == TYPE_DOCK) {
; NORM_ERR("alignment is disabled when own_window_type is dock");
else } else
#endif /*OWN_WINDOW */ #endif /*OWN_WINDOW */
if (value) { if (value) {
int a = string_to_alignment(value); int a = string_to_alignment(value);
@ -4029,6 +4029,11 @@ void initialisation(int argc, char **argv) {
set_first_font(optarg); set_first_font(optarg);
break; break;
case 'a': case 'a':
#ifdef OWN_WINDOW
if (window.type == TYPE_DOCK) {
NORM_ERR("alignment is disabled when own_window_type is dock");
} else
#endif /*OWN_WINDOW */
text_alignment = string_to_alignment(optarg); text_alignment = string_to_alignment(optarg);
break; break;