To replace nested types (CA1034 of StyleCop), the following is added.
- class ClickedEventArgs
- event EventHandler<ClickedEventArgs> in Button class
The followings are deprecated.
- class ClickEventArgs in Button class
- event EventHandler<ClickEventArgs> in Button class
Co-authored-by: Jaehyun Cho <jae_hyun.cho@samsung.com>
/// </summary>
/// <param name="eventArgs">The click information.</param>
[EditorBrowsable(EditorBrowsableState.Never)]
- protected virtual void OnClick(ClickEventArgs eventArgs)
+ protected virtual void OnClicked(ClickedEventArgs eventArgs)
{
}
LayoutChild();
}
- private void OnClickInternal(ClickEventArgs eventArgs)
+ private void OnClickedInternal(ClickedEventArgs eventArgs)
{
Command?.Execute(CommandParameter);
- OnClick(eventArgs);
- Extension?.OnClick(this, eventArgs);
- ClickEvent?.Invoke(this, eventArgs);
+ OnClicked(eventArgs);
+ Extension?.OnClicked(this, eventArgs);
+
+ ClickEventArgs nestedEventArgs = new ClickEventArgs();
+ ClickEvent?.Invoke(this, nestedEventArgs);
+ Clicked?.Invoke(this, eventArgs);
}
private void OnIconRelayout(object sender, EventArgs e)
namespace Tizen.NUI.Components
{
/// <summary>
+ /// ClickedEventArgs is a class to record button click event arguments which will sent to user.
+ /// </summary>
+ /// <since_tizen> 8 </since_tizen>
+ public class ClickedEventArgs : EventArgs
+ {
+ }
+
+ /// <summary>
/// Button is one kind of common component, a button clearly describes what action will occur when the user selects it.
/// Button may contain text or an icon.
/// </summary>
/// An event for the button clicked signal which can be used to subscribe or unsubscribe the event handler provided by the user.<br />
/// </summary>
/// <since_tizen> 6 </since_tizen>
+ [Obsolete("Deprecated in API8; Will be removed in API10. Please use Clicked event instead.")]
public event EventHandler<ClickEventArgs> ClickEvent;
/// <summary>
+ /// An event for the button clicked signal which can be used to subscribe or unsubscribe the event handler provided by the user.
+ /// </summary>
+ /// <since_tizen> 8 </since_tizen>
+ public event EventHandler<ClickedEventArgs> Clicked;
+
+ /// <summary>
/// An event for the button state changed signal which can be used to subscribe or unsubscribe the event handler provided by the user.<br />
/// </summary>
/// <since_tizen> 6 </since_tizen>
if (clicked)
{
- ClickEventArgs eventArgs = new ClickEventArgs();
- OnClickInternal(eventArgs);
+ ClickedEventArgs eventArgs = new ClickedEventArgs();
+ OnClickedInternal(eventArgs);
}
}
}
if (clicked)
{
- ClickEventArgs eventArgs = new ClickEventArgs();
- OnClickInternal(eventArgs);
+ ClickedEventArgs eventArgs = new ClickedEventArgs();
+ OnClickedInternal(eventArgs);
}
return true;
/// ClickEventArgs is a class to record button click event arguments which will sent to user.
/// </summary>
/// <since_tizen> 6 </since_tizen>
+ [Obsolete("Deprecated in API8; Will be removed in API10. Please use ClickedEventArgs instead.")]
public class ClickEventArgs : EventArgs
{
}
/// <param name="button">The Button instance that the extension currently applied to.</param>
/// <param name="eventArgs">The click event information.</param>
[EditorBrowsable(EditorBrowsableState.Never)]
- public virtual void OnClick(Button button, Button.ClickEventArgs eventArgs)
+ public virtual void OnClicked(Button button, ClickedEventArgs eventArgs)
{
}
root.Add(box);
box.image.SetValues();
- box.but1.ClickEvent += But1_ClickEvent;
+ box.but1.Clicked += But1_Clicked;
box.but1.Style.Text.Text = new Selector<string>
{
Normal = "Pause !",
Selected = "Play !"
};
- box.but2.ClickEvent += But2_ClickEvent;
+ box.but2.Clicked += But2_Clicked;
box.but2.Style.Text.Text = new Selector<string>
{
Normal = "Stop !",
box2.image.URLs = list;
box2.image.Play();
- box2.but1.ClickEvent += But1_ClickEvent1;
+ box2.but1.Clicked += But1_Clicked1;
box2.but1.Style.Text.Text = new Selector<string>
{
Normal = "Pause !",
box2.but1.Style.Text.MultiLine = true;
- box2.but2.ClickEvent += But2_ClickEvent1;
+ box2.but2.Clicked += But2_Clicked1;
box2.but2.IsSelectable = false;
box2.but2.Style.Text.Text = new Selector<string>
{
Pressed = "Up 100ms",
};
- box2.but3.ClickEvent += But3_ClickEvent;
+ box2.but3.Clicked += But3_Clicked;
box2.but3.IsSelectable = false;
box2.but3.Style.Text.Text = new Selector<string>
{
}
- private void But3_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void But3_Clicked(object sender, ClickedEventArgs e)
{
- tlog.Fatal(tag, $"But3_ClickEvent()!");
+ tlog.Fatal(tag, $"But3_Clicked()!");
var src = sender as Button;
if (src != null)
{
}
}
- private void But2_ClickEvent1(object sender, Button.ClickEventArgs e)
+ private void But2_Clicked1(object sender, ClickedEventArgs e)
{
- tlog.Fatal(tag, $"But2_ClickEvent1()!");
+ tlog.Fatal(tag, $"But2_Clicked1()!");
var src = sender as Button;
if (src != null)
{
box2.status.Text = $"playing now, frame delay: {box2.image.FrameDelay}ms, loop count: {box2.image.LoopCount}";
}
}
- private void But1_ClickEvent1(object sender, Button.ClickEventArgs e)
+ private void But1_Clicked1(object sender, ClickedEventArgs e)
{
- tlog.Fatal(tag, $"But1_ClickEvent1()!");
+ tlog.Fatal(tag, $"But1_Clicked1()!");
var src = sender as Button;
if (src != null)
{
}
}
- private void But2_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void But2_Clicked(object sender, ClickedEventArgs e)
{
- tlog.Fatal(tag, $"But2_ClickEvent()!");
+ tlog.Fatal(tag, $"But2_Clicked()!");
var src = sender as Button;
if (src != null)
{
}
}
- private void But1_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void But1_Clicked(object sender, ClickedEventArgs e)
{
- tlog.Fatal(tag, $"But1_ClickEvent()!");
+ tlog.Fatal(tag, $"But1_Clicked()!");
var src = sender as Button;
if (src != null)
{
iconButton.Size = new Size(80, 80);
iconButton.Icon.ResourceUrl = CommonResource.GetTVResourcePath() + "component/c_radiobutton/c_radiobutton_white_check.png";
parent2.Add(iconButton);
- iconButton.ClickEvent += (ojb, e) => {
+ iconButton.Clicked += (ojb, e) => {
var btn = iconButton.Icon.GetParent() as Button;
string name = btn.Name;
};
style.PivotPoint = PivotPoint.TopLeft;
style.Size = new Size(58, 58);
mSlideshowButton = new Button(style);
- mSlideshowButton.ClickEvent += OnPushButtonClicked;
+ mSlideshowButton.Clicked += OnPushButtonClicked;
mSlideshowButton.RaiseToTop();
if (mSlideshowButton)
{
tool_bar.Remove(mSlideshowButton);
- mSlideshowButton.ClickEvent -= OnPushButtonClicked;
+ mSlideshowButton.Clicked -= OnPushButtonClicked;
mSlideshowButton.Dispose();
mSlideshowButton = null;
}
Size = new Size(100, 50),
Margin = 10,
};
- btn_1.ClickEvent += Btn1_ClickEvent;
- btn_2.ClickEvent += Btn2_ClickEvent;
+ btn_1.Clicked += Btn1_Clicked;
+ btn_2.Clicked += Btn2_Clicked;
bottomView.Add(btn_1);
bottomView.Add(btn_2);
Size = new Size(50, 50),
Margin = 10,
};
- btn_5.ClickEvent += Btn5_ClickEvent;
- btn_6.ClickEvent += Btn6_ClickEvent;
+ btn_5.Clicked += Btn5_Clicked;
+ btn_6.Clicked += Btn6_Clicked;
bottomView_2.Add(btn_5);
bottomView_2.Add(btn_6);
}
- private void Btn1_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void Btn1_Clicked(object sender, ClickedEventArgs e)
{
GridLayout layout = new GridLayout();
layout.Columns = 5;
layout.LayoutWithTransition = true;
}
- private void Btn2_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void Btn2_Clicked(object sender, ClickedEventArgs e)
{
GridLayout layout = new GridLayout();
layout.LayoutWithTransition = true;
layoutOption = 2;
}
- private void Btn5_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void Btn5_Clicked(object sender, ClickedEventArgs e)
{
ObjectProcess(true);
}
- private void Btn6_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void Btn6_Clicked(object sender, ClickedEventArgs e)
{
ObjectProcess(false);
}
mEditButton.IsSelectable = true;
mEditButton.Size = new Size(34, 34);
mEditButton.LeaveRequired = true;
- mEditButton.ClickEvent += (obj, e) =>
+ mEditButton.Clicked += (obj, e) =>
{
SwitchToNextMode();
};
mLayoutButton.IsSelectable = true;
mLayoutButton.Size = new Size(34, 34);
mLayoutButton.LeaveRequired = true;
- mLayoutButton.ClickEvent += (obj, e) =>
+ mLayoutButton.Clicked += (obj, e) =>
{
mCurrentLayout = (mCurrentLayout + 1) % (int)mItemView.GetLayoutCount();
ChangeLayout();
mDeleteButton.Size = new Size(50, 50);
mDeleteButton.LeaveRequired = true;
mDeleteButton.Hide();
- mDeleteButton.ClickEvent += (obj, e) =>
+ mDeleteButton.Clicked += (obj, e) =>
{
ItemIdContainer removeList = new ItemIdContainer();
for (uint i = 0; i < mItemView.GetChildCount(); ++i)
mInsertButton.Size = new Size(50, 50);
mInsertButton.LeaveRequired = true;
mInsertButton.Hide();
- mInsertButton.ClickEvent += (obj, e) =>
+ mInsertButton.Clicked += (obj, e) =>
{
ItemContainer insertList = new ItemContainer();
Random random = new Random();
mReplaceButton.Size = new Size(50, 50);
mReplaceButton.LeaveRequired = true;
mReplaceButton.Hide();
- mReplaceButton.ClickEvent += (obj, e) =>
+ mReplaceButton.Clicked += (obj, e) =>
{
ItemContainer replaceList = new ItemContainer();
Random random = new Random();
button[0].BackgroundColor = Color.Green;
layout[0].Add(button[0]);
button[0].Focusable = true;
- button[0].ClickEvent += propFpsAdd;
+ button[0].Clicked += propFpsAdd;
FocusManager.Instance.SetCurrentFocusView(button[0]);
button[1] = new Button();
button[1].BackgroundColor = Color.Green;
layout[0].Add(button[1]);
button[1].Focusable = true;
- button[1].ClickEvent += propFpsMinus;
+ button[1].Clicked += propFpsMinus;
FocusManager.Instance.SetCurrentFocusView(button[1]);
gridLayout.Add(layout[0]);
button.WidthSpecification = 580;
button.HeightSpecification = 80;
button.TextLabel.Text = "LayoutDirection is left to right";
- button.ClickEvent += ButtonClickEvent;
+ button.Clicked += ButtonClicked;
parent1.Add(parent2);
parent1.Add(button);
}
}
- private void ButtonClickEvent(object sender, Button.ClickEventArgs e)
+ private void ButtonClicked(object sender, ClickedEventArgs e)
{
if (popup.LayoutDirection == ViewLayoutDirectionType.LTR)
{
button[0].BackgroundColor = Color.Green;
layout[2].Add(button[0]);
button[0].Focusable = true;
- button[0].ClickEvent += ProgressAdd;
+ button[0].Clicked += ProgressAdd;
button[1] = new Button();
button[1].WidthSpecification = 140;
button[1].BackgroundColor = Color.Green;
layout[2].Add(button[1]);
button[1].Focusable = true;
- button[1].ClickEvent += ProgressMinus;
+ button[1].Clicked += ProgressMinus;
}
private void CreateAttrElements()
Name = "test button",
};
- button.ClickEvent += (object source, Button.ClickEventArgs args) =>
+ button.Clicked += (object source, ClickedEventArgs args) =>
{
if (++cnt % 2 == 0)
{
}
button[0].Text = "+";
- button[0].ClickEvent += Scroll1Add;
+ button[0].Clicked += Scroll1Add;
button[1].Text = "-";
- button[1].ClickEvent += Scroll1Minus;
+ button[1].Clicked += Scroll1Minus;
button[2].Text = "+ / - 4";
- button[2].ClickEvent += Scroll1_2move;
+ button[2].Clicked += Scroll1_2move;
button[3].Text = "change direction";
- button[3].ClickEvent += Scroll1_2Changed;
+ button[3].Clicked += Scroll1_2Changed;
button[3].Size = new Size(180, 50);
// Set focus to Add Button
Position = new Position(10, H1 + 20),
Text = "add new child",
};
- b1.ClickEvent += B1_ClickEvent;
+ b1.Clicked += B1_Clicked;
win.Add(b1);
b2 = new Button()
Position = new Position(10, H1 + 20 + 120),
Text = "refresh sibling order",
};
- b2.ClickEvent += B2_ClickEvent;
+ b2.Clicked += B2_Clicked;
win.Add(b2);
b3 = new Button()
Position = new Position(10, H1 + 20 + 120 + 120),
Text = "place children to fit parent",
};
- b3.ClickEvent += B3_ClickEvent;
+ b3.Clicked += B3_Clicked;
win.Add(b3);
text = new TextLabel()
win.Add(text);
}
- private void B1_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void B1_Clicked(object sender, ClickedEventArgs e)
{
string n = "CH" + (v.ChildCount + 1);
var ch = new TextLabel();
a.Finished += A_Finished;
}
- private void B2_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void B2_Clicked(object sender, ClickedEventArgs e)
{
for(int i=0; i < v.ChildCount; i++)
{
}
}
- private void B3_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void B3_Clicked(object sender, ClickedEventArgs e)
{
for (int i = 0; i < v.ChildCount; i++)
{
public void Deactivate()
{
- b1.ClickEvent -= B1_ClickEvent;
- b2.ClickEvent -= B2_ClickEvent;
- b3.ClickEvent -= B3_ClickEvent;
+ b1.Clicked -= B1_Clicked;
+ b2.Clicked -= B2_Clicked;
+ b3.Clicked -= B3_Clicked;
b1.Unparent();
b2.Unparent();
button = new Button(buttonStyle);
button.Size = new Size(500, 80);
button.TextLabel.Text = mode[index];
- button.ClickEvent += ButtonClickEvent;
+ button.Clicked += ButtonClicked;
parentView[2].Add(button);
// Button of LayoutDirection
button2 = new Button(buttonStyle);
button2.Size = new Size(500, 80);
button2.TextLabel.Text = "LayoutDirection is left to right";
- button2.ClickEvent += ButtonClickEvent2;
+ button2.Clicked += ButtonClicked2;
parentView[2].Add(button2);
}
createText[1].Text = "Create Tab just by Style, Selected index from " + e.PreviousIndex + " to " + e.CurrentIndex;
}
- private void ButtonClickEvent(object sender, Button.ClickEventArgs e)
+ private void ButtonClicked(object sender, ClickedEventArgs e)
{
index = (index + 1) % 4;
button.TextLabel.Text = mode[index];
};
}
- private void ButtonClickEvent2(object sender, Button.ClickEventArgs e)
+ private void ButtonClicked2(object sender, ClickedEventArgs e)
{
if (tab.LayoutDirection == ViewLayoutDirectionType.LTR)
{
parentView[1].Add(button[i]);
}
button[0].Text = "toast1_1 Show";
- button[0].ClickEvent += toast1_1Show;
+ button[0].Clicked += toast1_1Show;
button[1].Text = "toast2_1 Show";
- button[1].ClickEvent += toast2_1Show;
+ button[1].Clicked += toast2_1Show;
// Set init focus
FocusManager.Instance.SetCurrentFocusView(button[0]);
myContent1.ParentOrigin = ParentOrigin.Center;
myContent1.PivotPoint = PivotPoint.Center;
myPopup1.AppendContent("ContentText", myContent1);
- leftButton.ClickEvent += LeftButton_ClickEvent;
- rightButton.ClickEvent += RightButton_ClickEvent;
+ leftButton.Clicked += LeftButton_Clicked;
+ rightButton.Clicked += RightButton_Clicked;
myPopup1.OutsideClicked += Mp_OutsideClicked;
myPopup1.ContentContainer.WidthResizePolicy = ResizePolicyType.FitToChildren;
NUIApplication.GetDefaultWindow().Add(t1);
}
- private void RightButton_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void RightButton_Clicked(object sender, ClickedEventArgs e)
{
myPopup1.Dismiss();
}
- private void LeftButton_ClickEvent(object sender, Button.ClickEventArgs e)
+ private void LeftButton_Clicked(object sender, ClickedEventArgs e)
{
myContent1.TextColor = Color.Yellow;
}
projects / platform / core / csapi / tizenfx.git / commitdiff