mirror of https://github.com/davatorium/rofi.git
Merge remote-tracking branch 'origin/next' into header-include-hell
This commit is contained in:
commit
7c2ce92561
|
@ -148,9 +148,9 @@ AC_DEFINE_UNQUOTED([GLIB_VERSION_MAX_ALLOWED], [(G_ENCODE_VERSION(${glib_min_maj
|
||||||
GW_CHECK_XCB([xcb-aux xcb-xkb xkbcommon xkbcommon-x11 xcb-ewmh xcb-icccm xcb-cursor xcb-randr xcb-xinerama ])
|
GW_CHECK_XCB([xcb-aux xcb-xkb xkbcommon xkbcommon-x11 xcb-ewmh xcb-icccm xcb-cursor xcb-randr xcb-xinerama ])
|
||||||
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([imdkit], AS_HELP_STRING([--disable-imdkit], [Build with checks using check library (default: enabled)]))
|
AC_ARG_ENABLE([imdkit], AS_HELP_STRING([--enable-imdkit], [Build with checks using check library (default: disabled)]))
|
||||||
|
|
||||||
AS_IF([test "x${enable_imdkit}" != "xno"], [
|
AS_IF([test "x${enable_imdkit}" = "xyes"], [
|
||||||
PKG_CHECK_MODULES([imdclient], [xcb-imdkit <= 1.0.2 ],
|
PKG_CHECK_MODULES([imdclient], [xcb-imdkit <= 1.0.2 ],
|
||||||
[AC_DEFINE([XCB_IMDKIT_1_0_3_LOWER], [1], [Indicate lower version of imdclient])
|
[AC_DEFINE([XCB_IMDKIT_1_0_3_LOWER], [1], [Indicate lower version of imdclient])
|
||||||
AC_DEFINE([XCB_IMDKIT],[1], [IMD Kit missing])],
|
AC_DEFINE([XCB_IMDKIT],[1], [IMD Kit missing])],
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
option('drun', type: 'boolean', value: true, description: 'Desktop file mode')
|
option('drun', type: 'boolean', value: true, description: 'Desktop file mode')
|
||||||
option('window', type: 'boolean', value: true, description: 'Window switcher mode')
|
option('window', type: 'boolean', value: true, description: 'Window switcher mode')
|
||||||
option('check', type: 'feature', description: 'Build and run libcheck-based tests')
|
option('check', type: 'feature', description: 'Build and run libcheck-based tests')
|
||||||
option('imdkit', type: 'boolean', value: true, description: 'IMDKit support')
|
option('imdkit', type: 'boolean', value: false, description: 'IMDKit support')
|
||||||
|
|
|
@ -175,6 +175,7 @@ static void listview_add_widget(listview *lv, _listview_row *row, widget *wid,
|
||||||
row->textbox =
|
row->textbox =
|
||||||
textbox_create(WIDGET(wid), WIDGET_TYPE_TEXTBOX_TEXT, "element-text",
|
textbox_create(WIDGET(wid), WIDGET_TYPE_TEXTBOX_TEXT, "element-text",
|
||||||
TB_AUTOHEIGHT | flags, NORMAL, "DDD", 0, 0);
|
TB_AUTOHEIGHT | flags, NORMAL, "DDD", 0, 0);
|
||||||
|
textbox_set_ellipsize(row->textbox, lv->emode);
|
||||||
box_add((box *)wid, WIDGET(row->textbox), TRUE);
|
box_add((box *)wid, WIDGET(row->textbox), TRUE);
|
||||||
} else if (strcasecmp(label, "element-index") == 0) {
|
} else if (strcasecmp(label, "element-index") == 0) {
|
||||||
row->index =
|
row->index =
|
||||||
|
|
Loading…
Reference in New Issue