PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Rename inner_margin to padding so it goal is more clear. issue #14

This commit is contained in:
QC 2014-01-28 20:48:48 +01:00
parent 8508c73b12
commit 8a053642c4
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.c
View File

@ -68,6 +68,6 @@ Settings config = {
.location = CENTER, .location = CENTER,
// Mode of window, list (Vertical) or dmenu like (Horizontal) // Mode of window, list (Vertical) or dmenu like (Horizontal)
.wmode = VERTICAL, .wmode = VERTICAL,
// Inner margin of the window. // Padding of the window.
.inner_margin = 5 .padding = 5
}; };

2
include/simpleswitcher.h
View File

@ -90,7 +90,7 @@ typedef struct _Settings {
char * ssh_key; char * ssh_key;
WindowLocation location; WindowLocation location;
WindowMode wmode; WindowMode wmode;
unsigned int inner_margin; unsigned int padding;
#ifdef I3 #ifdef I3
char * mark_key; char * mark_key;
#endif #endif

28
source/simpleswitcher.c
View File

@ -763,10 +763,10 @@ int menu( char **lines, char **input, char *prompt, Time *time, int *shift,
// Calculate as float to stop silly, big rounding down errors. // Calculate as float to stop silly, big rounding down errors.
int w = config.menu_width < 101 ? ( mon.w/100.0f )*( float )config.menu_width: config.menu_width; int w = config.menu_width < 101 ? ( mon.w/100.0f )*( float )config.menu_width: config.menu_width;
int x = mon.x + ( mon.w - w )/2; int x = mon.x + ( mon.w - w )/2;
int element_width = w -( 2*( config.inner_margin ) ); int element_width = w -( 2*( config.padding ) );
if ( config.wmode == HORIZONTAL ) { if ( config.wmode == HORIZONTAL ) {
element_width = ( w-( 2*( config.inner_margin ) )-max_lines*LINE_MARGIN )/( max_lines+1 ); element_width = ( w-( 2*( config.padding ) )-max_lines*LINE_MARGIN )/( max_lines+1 );
} }
Window box; Window box;
@ -804,8 +804,8 @@ int menu( char **lines, char **input, char *prompt, Time *time, int *shift,
// search text input // search text input
textbox *text = textbox_create( box, TB_AUTOHEIGHT|TB_EDITABLE, textbox *text = textbox_create( box, TB_AUTOHEIGHT|TB_EDITABLE,
( config.inner_margin ), ( config.padding ),
( config.inner_margin ), ( config.padding ),
element_width, 1, element_width, 1,
config.menu_font, config.menu_fg, config.menu_bg, config.menu_font, config.menu_fg, config.menu_bg,
( input!= NULL )?*input:"", prompt ); ( input!= NULL )?*input:"", prompt );
@ -820,7 +820,7 @@ int menu( char **lines, char **input, char *prompt, Time *time, int *shift,
if ( config.wmode == HORIZONTAL ) { if ( config.wmode == HORIZONTAL ) {
// Number of columns is the width of the screen - the inner margins + trailing line margin. // Number of columns is the width of the screen - the inner margins + trailing line margin.
columns = ( w-2*( config.inner_margin )+LINE_MARGIN )/( element_width+LINE_MARGIN ); columns = ( w-2*( config.padding )+LINE_MARGIN )/( element_width+LINE_MARGIN );
} }
for ( i = 0; i < max_lines; i++ ) { for ( i = 0; i < max_lines; i++ ) {
@ -828,8 +828,8 @@ int menu( char **lines, char **input, char *prompt, Time *time, int *shift,
int line = ( i+1 )/columns; int line = ( i+1 )/columns;
boxes[i] = textbox_create( box, boxes[i] = textbox_create( box,
0, 0,
( config.inner_margin )+col*( element_width+LINE_MARGIN ), // X ( config.padding )+col*( element_width+LINE_MARGIN ), // X
line * line_height + config.inner_margin +( ( config.wmode == HORIZONTAL )?0:LINE_MARGIN ), // y line * line_height + config.padding +( ( config.wmode == HORIZONTAL )?0:LINE_MARGIN ), // y
element_width, // w element_width, // w
line_height, // h line_height, // h
config.menu_font, config.menu_fg, config.menu_bg, lines[i], NULL ); config.menu_font, config.menu_fg, config.menu_bg, lines[i], NULL );
@ -870,10 +870,10 @@ int menu( char **lines, char **input, char *prompt, Time *time, int *shift,
// resize window vertically to suit // resize window vertically to suit
// Subtract the margin of the last row. // Subtract the margin of the last row.
int h = line_height * ( max_lines+1 ) + ( config.inner_margin )*2 +LINE_MARGIN; int h = line_height * ( max_lines+1 ) + ( config.padding )*2 +LINE_MARGIN;
if ( config.wmode == HORIZONTAL ) { if ( config.wmode == HORIZONTAL ) {
h = line_height+( config.inner_margin )*2; h = line_height+( config.padding )*2;
} }
// Default location is center. // Default location is center.
@ -931,10 +931,10 @@ int menu( char **lines, char **input, char *prompt, Time *time, int *shift,
// Why do we need the specian -1? // Why do we need the specian -1?
if ( config.wmode == VERTICAL ) { if ( config.wmode == VERTICAL ) {
XDrawLine( display, main_window, gc, ( config.inner_margin ), XDrawLine( display, main_window, gc, ( config.padding ),
line_height+( config.inner_margin )+( LINE_MARGIN-2 )/2, line_height+( config.padding )+( LINE_MARGIN-2 )/2,
w-( ( config.inner_margin ) )-1, w-( ( config.padding ) )-1,
line_height+( config.inner_margin ) +( LINE_MARGIN-2 )/2 ); line_height+( config.padding ) +( LINE_MARGIN-2 )/2 );
} }
} else if ( ev.type == KeyPress ) { } else if ( ev.type == KeyPress ) {
while ( XCheckTypedEvent( display, KeyPress, &ev ) ); while ( XCheckTypedEvent( display, KeyPress, &ev ) );
@ -1392,7 +1392,7 @@ int main( int argc, char *argv[] )
find_arg_int( argc, argv, "-loc", &( config.location ) ); find_arg_int( argc, argv, "-loc", &( config.location ) );
config.wmode = ( find_arg( argc, argv, "-hmode" ) >= 0 )?HORIZONTAL:VERTICAL; config.wmode = ( find_arg( argc, argv, "-hmode" ) >= 0 )?HORIZONTAL:VERTICAL;
find_arg_int( argc, argv, "-padding", &( config.inner_margin ) ); find_arg_int( argc, argv, "-padding", &( config.padding ) );
#ifdef I3 #ifdef I3
// Check for i3 // Check for i3