• R/O
  • SSH
  • HTTPS

utable: 提交


Commit MetaInfo

修訂729 (tree)
時間2022-04-06 16:08:51
作者shuetsu

Log Message

TrimmingStyleプロパティを追加

Change Summary

差異

--- utable/trunk/table/FieldProvider/FieldProvider.vb (revision 728)
+++ utable/trunk/table/FieldProvider/FieldProvider.vb (revision 729)
@@ -197,6 +197,20 @@
197197 ret.LineAlignment = StringAlignment.Near
198198 End If
199199 End If
200+ Select Case s.TrimmingStyle
201+ Case UTable.ETrimmingStyle.NONE
202+ ret.Trimming = StringTrimming.None
203+ Case UTable.ETrimmingStyle.WORD
204+ ret.Trimming = StringTrimming.Word
205+ Case UTable.ETrimmingStyle.ELLIPSIS_CHARACTER
206+ ret.Trimming = StringTrimming.EllipsisCharacter
207+ Case UTable.ETrimmingStyle.ELLIPSIS_PATH
208+ ret.Trimming = StringTrimming.EllipsisPath
209+ Case UTable.ETrimmingStyle.ELLIPSIS_WORD
210+ ret.Trimming = StringTrimming.EllipsisWord
211+ Case Else
212+ ret.Trimming = StringTrimming.Character
213+ End Select
200214 Return ret
201215 End Function
202216
--- utable/trunk/table/My Project/AssemblyInfo.vb (revision 728)
+++ utable/trunk/table/My Project/AssemblyInfo.vb (revision 729)
@@ -31,5 +31,5 @@
3131 ' 既定値にすることができます:
3232 ' <Assembly: AssemblyVersion("1.0.*")>
3333
34-<Assembly: AssemblyVersion("2.12.130.0")>
35-<Assembly: AssemblyFileVersion("2.12.130.0")>
34+<Assembly: AssemblyVersion("2.12.131.0")>
35+<Assembly: AssemblyFileVersion("2.12.131.0")>
--- utable/trunk/table/Setting.vb (revision 728)
+++ utable/trunk/table/Setting.vb (revision 729)
@@ -89,6 +89,16 @@
8989 BOUND
9090 End Enum
9191
92+ Public Enum ETrimmingStyle
93+ [DEFARULT]
94+ NONE
95+ CHARACTER
96+ WORD
97+ ELLIPSIS_CHARACTER
98+ ELLIPSIS_PATH
99+ ELLIPSIS_WORD
100+ End Enum
101+
92102 Public Enum EBorderStyle
93103 [DEFAULT]
94104 SOLID
@@ -134,6 +144,7 @@
134144 Public CaptionStyle As ECaptionStyle = ECaptionStyle.DEFAULT
135145 Public StayVertical As EStay = EStay.DEFAULT
136146 Public StayHorizontal As EStay = EStay.DEFAULT
147+ Public TrimmingStyle As ETrimmingStyle = ETrimmingStyle.DEFARULT
137148 Public StringFormatFlags As StringFormatFlags = 0
138149 Public Cursor As Cursor = Nothing
139150
@@ -169,6 +180,7 @@
169180 s.StayVertical = Me.StayVertical
170181 s.StayHorizontal = Me.StayHorizontal
171182 s.CaptionStyle = Me.CaptionStyle
183+ s.TrimmingStyle = Me.TrimmingStyle
172184 s.StringFormatFlags = Me.StringFormatFlags
173185 s.Cursor = Me.Cursor
174186 Return s
@@ -224,6 +236,7 @@
224236 Public VerticalAlignment As EVAlign = EVAlign.MIDDLE
225237 Public LeftBound As EBound = EBound.NOT_BOUND
226238 Public TopBound As EBound = EBound.NOT_BOUND
239+ Public RightBottomBound As EBound = EBound.NOT_BOUND
227240 Public Editable As EAllow = EAllow.ALLOW
228241 Public UserColAdjustable As EAllow = EAllow.ALLOW
229242 Public UserColResizable As EAllow = EAllow.ALLOW
@@ -242,6 +255,7 @@
242255 Public ScrollUnit As EScrollUnit = EScrollUnit.FIELD
243256 Public StayVertical As EStay = EStay.NOT_STAY
244257 Public StayHorizontal As EStay = EStay.NOT_STAY
258+ Public TrimmingStyle As ETrimmingStyle = ETrimmingStyle.CHARACTER
245259 Public EnterContent As CContent
246260 Public FocusColorAlways As Boolean = True
247261 Public AlterConsistent As Boolean = False
@@ -588,6 +602,15 @@
588602 Return Me.GlobalSetting.CaptionStyle
589603 End Function
590604
605+ Public Function TrimmingStyle() As ETrimmingStyle
606+ For Each s As CSetting In Me.Settings
607+ If s.TrimmingStyle <> EBound.DEFAULT Then
608+ Return s.TrimmingStyle
609+ End If
610+ Next
611+ Return Me.GlobalSetting.TrimmingStyle
612+ End Function
613+
591614 Public Function Cursor() As Cursor
592615 For Each s As CSetting In Me.Settings
593616 If s.Cursor IsNot Nothing Then
Show on old repository browser