projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- read $sysconfdir/mime.types in addition (fixes bug #6197 except not with an option)
[apps/madmutt.git]
/
sidebar.c
diff --git
a/sidebar.c
b/sidebar.c
index
4ea49d4
..
42a3546
100644
(file)
--- a/
sidebar.c
+++ b/
sidebar.c
@@
-31,7
+31,6
@@
static int CurBuffy = 0;
static int known_lines = 0;
static short initialized = 0;
static short prev_show_value;
static int known_lines = 0;
static short initialized = 0;
static short prev_show_value;
-static short saveSidebarWidth;
/* computes first entry to be shown */
void calc_boundaries (int menu)
/* computes first entry to be shown */
void calc_boundaries (int menu)
@@
-44,11
+43,8
@@
void calc_boundaries (int menu)
CurBuffy = 0;
if (TopBuffy < 0 || TopBuffy >= Incoming->length)
TopBuffy = 0;
CurBuffy = 0;
if (TopBuffy < 0 || TopBuffy >= Incoming->length)
TopBuffy = 0;
- /* correct known_lines if it has changed because of a window resize */
- /* if (known_lines != LINES)
- known_lines = LINES; */
- lines = LINES - 2 - (
menu != MENU_PAGER ||
option (OPTSTATUSONTOP));
+ lines = LINES - 2 - (option (OPTSTATUSONTOP));
known_lines = lines;
if (option (OPTSIDEBARNEWMAILONLY)) {
int i = CurBuffy;
known_lines = lines;
if (option (OPTSIDEBARNEWMAILONLY)) {
int i = CurBuffy;
@@
-149,6
+145,14
@@
static const char* sidebar_number_format (char* dest, size_t destlen, char op,
break;
/* new */
case 'n':
break;
/* new */
case 'n':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->new : b->new);
+ } else if ((c && Context->new == 0) || (!c && b->new == 0))
+ opt = 0;
+ break;
+ /* unread */
+ case 'u':
if (!opt) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, c ? Context->unread : b->msg_unread);
if (!opt) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, c ? Context->unread : b->msg_unread);
@@
-287,22
+291,14
@@
int sidebar_draw (int menu)
/* initialize first time */
if (!initialized) {
prev_show_value = option (OPTMBOXPANE);
/* initialize first time */
if (!initialized) {
prev_show_value = option (OPTMBOXPANE);
- saveSidebarWidth = SidebarWidth;
- if (!option (OPTMBOXPANE)){
- SidebarWidth = 0;
+ if (!option (OPTMBOXPANE))
draw_devider = 1;
draw_devider = 1;
- }
initialized = 1;
}
/* save or restore the value SidebarWidth */
if (prev_show_value != option (OPTMBOXPANE)) {
initialized = 1;
}
/* save or restore the value SidebarWidth */
if (prev_show_value != option (OPTMBOXPANE)) {
- if (prev_show_value && !option (OPTMBOXPANE)) {
- saveSidebarWidth = SidebarWidth;
- SidebarWidth = 0;
- }
- else if (!prev_show_value && option (OPTMBOXPANE)) {
- SidebarWidth = saveSidebarWidth;
+ if (!prev_show_value && option (OPTMBOXPANE)) {
/* after toggle: force recounting of all mail */
buffy_check (2);
}
/* after toggle: force recounting of all mail */
buffy_check (2);
}