Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Invalid message for DSOPanel (MSWord)

Browse Source 
Comment-out unused varaible
Calculate Table Width and Location
Fixed Arrow-Up and Arrow-Down to account for Tables
Adjust Table location based upon the width of the Table
This commit is contained in:
Rich
2010-10-12 15:01:09 +00:00
parent dc6721f54c
commit e278a2ca37
8 changed files with 150 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
PROMS/Volian.Controls.Library/StepRTB.cs
View File

@@ -191,8 +191,11 @@ namespace Volian.Controls.Library
int widS = /* _WidthAdjust + borderWidth + */ MyStepItem.MyStepPanel.ToDisplay(MyStepItem.MyStepSectionLayoutData.WidSTableEdit, MyItemInfo.ColumnMode);
//int wNew = _MyStepItem.MyStepPanel.ToDisplay(_MyStepItem.MyStepSectionLayoutData.WidT);
int wNew = 70 + widS + colR * MyItemInfo.ColumnMode;
if(wNew > _MyStepItem.ItemWidth)
_MyStepItem.ItemWidth= wNew;
if (wNew > _MyStepItem.ItemWidth)
{
_MyStepItem.ItemWidth = wNew;
_MyStepItem.ItemLocation = _MyStepItem.TableLocation(_MyStepItem.MyParentStepItem, _MyStepItem.MyStepSectionLayoutData, wNew);
}
}
_InitializingRTB = true;
_SelectedRtfSB.Remove(0, _SelectedRtfSB.Length);
@@ -234,14 +237,13 @@ namespace Volian.Controls.Library
RemoveEventHandlers();
if ((!_MyItemInfo.IsSection && !_MyItemInfo.IsProcedure) && (_MyItemInfo.IsTable || _MyItemInfo.IsFigure))
{
int newwidth = (int)_MyStepItem.TableWidth(Font, Text, true);
int newwidth = (int)_MyStepItem.TableWidth(Font, Text, false);
if (_MyStepItem.ItemWidth != newwidth)
{
_MyStepItem.ItemWidth = newwidth;
_MyStepItem.ItemLocation = _MyStepItem.TableLocation(_MyStepItem.MyParentStepItem, _MyStepItem.MyStepSectionLayoutData, newwidth);
}
// int typ = ((int)_MyItemInfo.MyContent.Type) % 10000;
// OutlineTable(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList[typ].Type.IndexOf(@"Borderless")<0);
// FindAllLinks();
}
SelectAll();
if (SelectionHangingIndent !=0) SelectionHangingIndent = 0;
@@ -268,7 +270,7 @@ namespace Volian.Controls.Library
_InitializingRTB = false;
_MyItemInfo.MyConfig.PropertyChanged += new PropertyChangedEventHandler(MyConfig_PropertyChanged);
AdjustSizeForContents(!edit); // TODO: this is not quite right yet.
if (MyStepItem != null) MyStepItem.ChangeBar = MyStepItem.MyItemInfo.HasChangeBar();
if (MyStepItem != null) MyStepItem.ChangeBar = MyStepItem.MyItemInfo.HasChangeBar();
}
private bool _ProcessKeystrokes = true;
public bool ProcessKeystrokes
@@ -380,9 +382,12 @@ namespace Volian.Controls.Library
this.MouseDown -= new MouseEventHandler(StepRTB_MouseDown);
this.MouseLeave -= new EventHandler(StepRTB_MouseLeave);
this.SelectionChanged -= new EventHandler(StepRTB_SelectionChanged);
this.ContextMenuStripChanged -= new EventHandler(StepRTB_ContextMenuStripChanged);
this.RTBSelectionChanged -= new StepRTBEvent(StepRTB_RTBSelectionChanged);
}
private void AddEventHandlers()
{
// Always be sure to add the same event handlers to RemoveEventHandlers
BorderStyle = System.Windows.Forms.BorderStyle.None;
this.DetectUrls = true;
ContentsResized += new ContentsResizedEventHandler(StepRTB_ContentsResized);
@@ -398,13 +403,11 @@ namespace Volian.Controls.Library
this.ContextMenuStripChanged += new EventHandler(StepRTB_ContextMenuStripChanged);
this.RTBSelectionChanged += new StepRTBEvent(StepRTB_RTBSelectionChanged);
}
void StepRTB_RTBSelectionChanged(object sender, EventArgs args)
{
//Console.WriteLine("RTBSelectionChanged id= {0}", MyItemInfo.ItemID);
if (!Focused) Focus();
}
void StepRTB_ContextMenuStripChanged(object sender, EventArgs e)
{
//Console.WriteLine("********** StepRTB_ContextMenuStripChanged");