From c7c593395d2a91634a892c148df7d6badf5a3c94 Mon Sep 17 00:00:00 2001 From: Vladimir Enchev Date: Thu, 14 Apr 2016 09:36:08 +0300 Subject: [PATCH] SegmentedBar item titles wrapping fixed. Now similar to iOS. --- apps/ui-tests-app/tab-view/nowrap.xml | 12 ++++++++++++ ui/segmented-bar/segmented-bar.android.ts | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 apps/ui-tests-app/tab-view/nowrap.xml diff --git a/apps/ui-tests-app/tab-view/nowrap.xml b/apps/ui-tests-app/tab-view/nowrap.xml new file mode 100644 index 000000000..d64f1c16a --- /dev/null +++ b/apps/ui-tests-app/tab-view/nowrap.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ui/segmented-bar/segmented-bar.android.ts b/ui/segmented-bar/segmented-bar.android.ts index 6bef96974..63c0976ae 100644 --- a/ui/segmented-bar/segmented-bar.android.ts +++ b/ui/segmented-bar/segmented-bar.android.ts @@ -58,7 +58,7 @@ function onItemsPropertyChanged(data: dependencyObservable.PropertyChangeData) { tab.setIndicator(newItems[i].title || ""); tab.setContent(new android.widget.TabHost.TabContentFactory({ - createTabContent: function (tag: string): android.view.View { + createTabContent: function(tag: string): android.view.View { var tv = new android.widget.TextView(view._context); tv.setVisibility(android.view.View.GONE); return tv; @@ -102,6 +102,9 @@ function onItemsPropertyChanged(data: dependencyObservable.PropertyChangeData) { if (view.color) { t.setTextColor(view.color.android); } + + t.setSingleLine(true); + t.setEllipsize(android.text.TextUtils.TruncateAt.END); } } } @@ -158,7 +161,7 @@ export class SegmentedBar extends common.SegmentedBar { var that = new WeakRef(this); this._listener = new android.widget.TabHost.OnTabChangeListener({ - onTabChanged: function (id: string) { + onTabChanged: function(id: string) { var bar = that.get(); if (bar) { bar.selectedIndex = parseInt(id);