osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Yet another fix, put spaces in insensitive or normal state. 

svn path=/trunk/; revision=50099
This commit is contained in:
Jakub Zawadzki 2013-06-21 00:42:19 +00:00
parent 135ecc1d88
commit 2bd2bfb416
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/gtk/bytes_view.c
View File

@ -631,9 +631,10 @@ _bytes_view_line_common(BytesView *bv, void *data, const int org_off, int xx, in
GTK_STATE_NORMAL;
if (state_cur != state) {
/* ok, we want to put space, we prefer to put it in STATE_NORMAL, but if it's transition from field-highlight to proto-highlight (common), do it now */
/* below shorter version of: ((state != GTK_STATE_NORMAL && state_cur != GTK_STATE_NORMAL) || (state == GTK_STATE_NORMAL)) */
if (state_cur != GTK_STATE_NORMAL && byten) {
/* ok, we want to put space, we prefer to put it in STATE_NORMAL or STATE_INSENSITIVE */
int space_now = (state_cur != GTK_STATE_NORMAL && state_cur != GTK_STATE_INSENSITIVE);
if (space_now && byten) {
str[cur++] = ' ';
/* insert a space every BYTE_VIEW_SEP bytes */
if ((off % BYTE_VIEW_SEP) == 0)
@ -647,7 +648,7 @@ _bytes_view_line_common(BytesView *bv, void *data, const int org_off, int xx, in
bytes_view_render_state(bv, state_cur);
state = state_cur;
if (state == GTK_STATE_NORMAL && byten) {
if (!space_now && byten) {
str[cur++] = ' ';
/* insert a space every BYTE_VIEW_SEP bytes */
if ((off % BYTE_VIEW_SEP) == 0)
@ -715,7 +716,9 @@ _bytes_view_line_common(BytesView *bv, void *data, const int org_off, int xx, in
GTK_STATE_NORMAL;
if (state_cur != state) {
if (state_cur != GTK_STATE_NORMAL && byten) {
int space_now = (state_cur != GTK_STATE_NORMAL && state_cur != GTK_STATE_INSENSITIVE);
if (space_now && byten) {
/* insert a space every BYTE_VIEW_SEP bytes */
if ((off % BYTE_VIEW_SEP) == 0)
str[cur++] = ' ';
@ -728,7 +731,7 @@ _bytes_view_line_common(BytesView *bv, void *data, const int org_off, int xx, in
bytes_view_render_state(bv, state_cur);
state = state_cur;
if (state == GTK_STATE_NORMAL && byten) {
if (!space_now && byten) {
/* insert a space every BYTE_VIEW_SEP bytes */
if ((off % BYTE_VIEW_SEP) == 0)
str[cur++] = ' ';