devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Add occupants wrap option

Browse Source 
Wrapping for the occupants panel like already exists for the roster
panel. See `/occupants wrap on`.

Regards https://github.com/boothj5/profanity/issues/690
This commit is contained in:
Michael Vetter
2019-04-23 16:54:40 +02:00
parent 637dfca6dd
commit 125ca2f0d2
7 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ui/console.c
View File

@@ -1232,6 +1232,11 @@ cons_occupants_setting(void)
else
cons_show("Occupant jids (/occupants) : hide");
if (prefs_get_boolean(PREF_OCCUPANTS_WRAP))
cons_show("Occupants wrap (/occupants) : ON");
else
cons_show("Occupants wrap (/occupants) : OFF");
gint occupant_indent = prefs_get_occupants_indent();
cons_show("Occupant indent (/occupants) : %d", occupant_indent);

8
src/ui/occupantswin.c
View File

@@ -49,7 +49,9 @@ _occuptantswin_occupant(ProfLayoutSplit *layout, Occupant *occupant, gboolean sh
GString *spaces = g_string_new(" ");
int indent = prefs_get_occupants_indent();
int current_indent = 0;
if (indent > 0) {
current_indent += indent;
while (indent > 0) {
g_string_append(spaces, " ");
indent--;
@@ -59,8 +61,10 @@ _occuptantswin_occupant(ProfLayoutSplit *layout, Occupant *occupant, gboolean sh
GString *msg = g_string_new("");
g_string_append(msg, spaces->str);
gboolean wrap = prefs_get_boolean(PREF_OCCUPANTS_WRAP);
g_string_append(msg, occupant->nick);
win_sub_print(layout->subwin, msg->str, TRUE, FALSE, 0);
win_sub_print(layout->subwin, msg->str, TRUE, wrap, current_indent);
g_string_free(msg, TRUE);
if (showjid && occupant->jid) {
@@ -69,7 +73,7 @@ _occuptantswin_occupant(ProfLayoutSplit *layout, Occupant *occupant, gboolean sh
g_string_append(msg, " ");
g_string_append(msg, occupant->jid);
win_sub_print(layout->subwin, msg->str, TRUE, FALSE, 0);
win_sub_print(layout->subwin, msg->str, TRUE, wrap, current_indent);
g_string_free(msg, TRUE);
}