diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /scripts/kconfig/lxdialog/checklist.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'scripts/kconfig/lxdialog/checklist.c')
| -rw-r--r-- | scripts/kconfig/lxdialog/checklist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c index a2eb80fbc896..3b15c08ec1fa 100644 --- a/scripts/kconfig/lxdialog/checklist.c +++ b/scripts/kconfig/lxdialog/checklist.c | |||
| @@ -132,16 +132,16 @@ int dialog_checklist(const char *title, const char *prompt, int height, | |||
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | do_resize: | 134 | do_resize: |
| 135 | if (getmaxy(stdscr) < (height + 6)) | 135 | if (getmaxy(stdscr) < (height + CHECKLIST_HEIGTH_MIN)) |
| 136 | return -ERRDISPLAYTOOSMALL; | 136 | return -ERRDISPLAYTOOSMALL; |
| 137 | if (getmaxx(stdscr) < (width + 6)) | 137 | if (getmaxx(stdscr) < (width + CHECKLIST_WIDTH_MIN)) |
| 138 | return -ERRDISPLAYTOOSMALL; | 138 | return -ERRDISPLAYTOOSMALL; |
| 139 | 139 | ||
| 140 | max_choice = MIN(list_height, item_count()); | 140 | max_choice = MIN(list_height, item_count()); |
| 141 | 141 | ||
| 142 | /* center dialog box on screen */ | 142 | /* center dialog box on screen */ |
| 143 | x = (COLS - width) / 2; | 143 | x = (getmaxx(stdscr) - width) / 2; |
| 144 | y = (LINES - height) / 2; | 144 | y = (getmaxy(stdscr) - height) / 2; |
| 145 | 145 | ||
| 146 | draw_shadow(stdscr, y, x, height, width); | 146 | draw_shadow(stdscr, y, x, height, width); |
| 147 | 147 | ||