Skip to content

Don't hyphenate long filenames #2261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 11, 2019
Merged

Don't hyphenate long filenames #2261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3725cc
nemo-icon-canvas-item.c: Don't hyphenate long filenames
leigh123linux Dec 10, 2019
3bde3b5
eel-editable-label.c: Don't hyphenate long filenames
leigh123linux Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions eel/eel-editable-label.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>

#ifndef PANGO_CHECK_VERSION
#define PANGO_CHECK_VERSION(major, minor, micro) \
(PANGO_VERSION_MAJOR > (major) || \
(PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR > (minor)) || \
(PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR == (minor) && \
PANGO_VERSION_MICRO >= (micro)))
#endif


enum {
MOVE_CURSOR,
POPULATE_POPUP,
Expand Down Expand Up @@ -996,6 +1005,9 @@ eel_editable_label_ensure_layout (EelEditableLabel *label,
if (label->font_desc != NULL)
pango_layout_set_font_description (label->layout, label->font_desc);

#if PANGO_CHECK_VERSION (1, 44, 0)
pango_attr_list_insert (tmp_attrs, pango_attr_insert_hyphens_new (FALSE));
#endif
pango_layout_set_attributes (label->layout, tmp_attrs);

if (preedit_string)
Expand Down
22 changes: 22 additions & 0 deletions libnemo-private/nemo-icon-canvas-item.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
#define LABEL_OFFSET_BESIDES 3
#define LABEL_LINE_SPACING 0

#ifndef PANGO_CHECK_VERSION
#define PANGO_CHECK_VERSION(major, minor, micro) \
(PANGO_VERSION_MAJOR > (major) || \
(PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR > (minor)) || \
(PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR == (minor) && \
PANGO_VERSION_MICRO >= (micro)))
#endif

/* special text height handling
* each item has three text height variables:
* + text_height: actual height of the displayed (i.e. on-screen) PangoLayout.
Expand Down Expand Up @@ -1408,12 +1416,18 @@ create_label_layout (NemoIconCanvasItem *item,
GString *str;
char *zeroified_text;
const char *p;
#if PANGO_CHECK_VERSION (1, 44, 0)
PangoAttrList *attr_list;
#endif

canvas_item = EEL_CANVAS_ITEM (item);

container = NEMO_ICON_CONTAINER (canvas_item->canvas);
context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas));
layout = pango_layout_new (context);
#if PANGO_CHECK_VERSION (1, 44, 0)
attr_list = pango_attr_list_new ();
#endif

zeroified_text = NULL;

Expand Down Expand Up @@ -1449,6 +1463,11 @@ create_label_layout (NemoIconCanvasItem *item,
pango_layout_set_spacing (layout, LABEL_LINE_SPACING);
pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);

#if PANGO_CHECK_VERSION (1, 44, 0)
pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
pango_layout_set_attributes (layout, attr_list);
#endif

/* Create a font description */
if (container->details->font && g_strcmp0 (container->details->font, "") != 0) {
desc = pango_font_description_from_string (container->details->font);
Expand All @@ -1469,6 +1488,9 @@ create_label_layout (NemoIconCanvasItem *item,
pango_layout_set_font_description (layout, desc);
pango_font_description_free (desc);
g_free (zeroified_text);
#if PANGO_CHECK_VERSION (1, 44, 0)
pango_attr_list_unref (attr_list);
#endif

return layout;
}
Expand Down