gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00
Code Issues Projects Releases Wiki Activity

dock: Trivial code style cleanups

Browse Source 
Just random things I noticed while reading the code...

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
Carlos R. Mafra
2012-02-11 20:01:24 +00:00
parent 393a917a4f
commit 558fc5f0d3
1 changed files with 96 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/dock.c
View File

@@ -1151,8 +1151,6 @@ void wClipIconPaint(WAppIcon * aicon)
if(wPreferences.show_clip_title) if(wPreferences.show_clip_title)
WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx, ty, ws_name, length); WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx, ty, ws_name, length);
/*WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, 4,
2, ws_name, length); */
tx = (ICON_SIZE / 2 - WMWidthOfString(scr->clip_title_font, ws_number, nlength)) / 2; tx = (ICON_SIZE / 2 - WMWidthOfString(scr->clip_title_font, ws_number, nlength)) / 2;
@@ -1560,9 +1558,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList * dock_state, int type)
WMRetainPropList(dock_state); WMRetainPropList(dock_state);
/* restore position */ /* restore position */
value = WMGetFromPLDictionary(dock_state, dPosition); value = WMGetFromPLDictionary(dock_state, dPosition);
if (value) { if (value) {
if (!WMIsPLString(value)) { if (!WMIsPLString(value)) {
COMPLAIN("Position"); COMPLAIN("Position");
@@ -1604,11 +1600,9 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList * dock_state, int type)
} }
/* restore lowered/raised state */ /* restore lowered/raised state */
dock->lowered = 0; dock->lowered = 0;
value = WMGetFromPLDictionary(dock_state, dLowered); value = WMGetFromPLDictionary(dock_state, dLowered);
if (value) { if (value) {
if (!WMIsPLString(value)) { if (!WMIsPLString(value)) {
COMPLAIN("Lowered"); COMPLAIN("Lowered");
@@ -1620,11 +1614,9 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList * dock_state, int type)
} }
/* restore collapsed state */ /* restore collapsed state */
dock->collapsed = 0; dock->collapsed = 0;
value = WMGetFromPLDictionary(dock_state, dCollapsed); value = WMGetFromPLDictionary(dock_state, dCollapsed);
if (value) { if (value) {
if (!WMIsPLString(value)) { if (!WMIsPLString(value)) {
COMPLAIN("Collapsed"); COMPLAIN("Collapsed");
@@ -1636,9 +1628,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList * dock_state, int type)
} }
/* restore auto-collapsed state */ /* restore auto-collapsed state */
value = WMGetFromPLDictionary(dock_state, dAutoCollapse); value = WMGetFromPLDictionary(dock_state, dAutoCollapse);
if (value) { if (value) {
if (!WMIsPLString(value)) { if (!WMIsPLString(value)) {
COMPLAIN("AutoCollapse"); COMPLAIN("AutoCollapse");
@@ -1651,34 +1641,28 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList * dock_state, int type)
} }
/* restore auto-raise/lower state */ /* restore auto-raise/lower state */
value = WMGetFromPLDictionary(dock_state, dAutoRaiseLower); value = WMGetFromPLDictionary(dock_state, dAutoRaiseLower);
if (value) { if (value) {
if (!WMIsPLString(value)) { if (!WMIsPLString(value)) {
COMPLAIN("AutoRaiseLower"); COMPLAIN("AutoRaiseLower");
} else { } else {
if (strcasecmp(WMGetFromPLString(value), "YES") == 0) { if (strcasecmp(WMGetFromPLString(value), "YES") == 0)
dock->auto_raise_lower = 1; dock->auto_raise_lower = 1;
} }
} }
}
/* restore attract icons state */ /* restore attract icons state */
dock->attract_icons = 0; dock->attract_icons = 0;
value = WMGetFromPLDictionary(dock_state, dAutoAttractIcons); value = WMGetFromPLDictionary(dock_state, dAutoAttractIcons);
if (value) { if (value) {
if (!WMIsPLString(value)) { if (!WMIsPLString(value)) {
COMPLAIN("AutoAttractIcons"); COMPLAIN("AutoAttractIcons");
} else { } else {
if (strcasecmp(WMGetFromPLString(value), "YES") == 0) { if (strcasecmp(WMGetFromPLString(value), "YES") == 0)
dock->attract_icons = 1; dock->attract_icons = 1;
} }
} }
}
/* application list */ /* application list */
@@ -1700,17 +1684,14 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList * dock_state, int type)
apps = WMGetFromPLDictionary(dock_state, tmp); apps = WMGetFromPLDictionary(dock_state, tmp);
WMReleasePropList(tmp); WMReleasePropList(tmp);
if (!apps) { if (!apps)
apps = WMGetFromPLDictionary(dock_state, dApplications); apps = WMGetFromPLDictionary(dock_state, dApplications);
} }
}
if (!apps) { if (!apps)
goto finish; goto finish;
}
count = WMGetPropListItemCount(apps); count = WMGetPropListItemCount(apps);
if (count == 0) if (count == 0)
goto finish; goto finish;