ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update PolarFixed sample to remove obsolete warnings

Browse source
This commit is contained in:
Bertrand Lorentz 2011-06-12 20:27:17 +02:00
parent 6556eeb610
commit c0c89957cb
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sample/PolarFixed.cs
View file

@ -63,7 +63,7 @@ class PolarFixed : Container {
// The default is "GLib.GType.None", which technically means that no (new) // The default is "GLib.GType.None", which technically means that no (new)
// children can be added to the container, though Container.Add does not // children can be added to the container, though Container.Add does not
// enforce this. // enforce this.
public override GLib.GType ChildType () protected override GLib.GType OnChildType ()
{ {
return Gtk.Widget.GType; return Gtk.Widget.GType;
} }
@ -128,17 +128,18 @@ class PolarFixed : Container {
void OnSizeRequested (ref Requisition req) void OnSizeRequested (ref Requisition req)
{ {
Requisition childReq; int child_width, child_minwidth, child_height, child_minheight;
int x, y; int x, y;
req.Width = req.Height = 0; req.Width = req.Height = 0;
foreach (PolarFixedChild pfc in children) { foreach (PolarFixedChild pfc in children) {
// Recursively SizeRequest each child // Recursively request the size of each child
childReq = pfc.Child.SizeRequest (); pfc.Child.GetPreferredWidth (out child_minwidth, out child_width);
pfc.Child.GetPreferredHeight (out child_minheight, out child_height);
// Figure out where we're going to put it // Figure out where we're going to put it
x = (int)(Math.Cos (pfc.Theta) * pfc.R) + childReq.Width / 2; x = (int)(Math.Cos (pfc.Theta) * pfc.R) + child_width / 2;
y = (int)(Math.Sin (pfc.Theta) * pfc.R) + childReq.Height / 2; y = (int)(Math.Sin (pfc.Theta) * pfc.R) + child_height / 2;
// Update our own size request to fit it // Update our own size request to fit it
if (req.Width < 2 * x) if (req.Width < 2 * x)
@ -159,7 +160,7 @@ class PolarFixed : Container {
// aren't allocated enough room. // aren't allocated enough room.
protected override void OnSizeAllocated (Rectangle allocation) protected override void OnSizeAllocated (Rectangle allocation)
{ {
Requisition childReq; Requisition childReq, childMinReq;
int cx, cy, x, y; int cx, cy, x, y;
// This sets the "Allocation" property. For widgets that // This sets the "Allocation" property. For widgets that
@ -171,11 +172,7 @@ class PolarFixed : Container {
cy = allocation.Y + (allocation.Height / 2); cy = allocation.Y + (allocation.Height / 2);
foreach (PolarFixedChild pfc in children) { foreach (PolarFixedChild pfc in children) {
// Use ChildRequisition rather than SizeRequest(), pfc.Child.GetPreferredSize (out childMinReq, out childReq);
// to ask for "what this child requested in the
// last SizeRequest", rather than having it
// compute it anew.
childReq = pfc.Child.ChildRequisition;
x = (int)(Math.Cos (pfc.Theta) * pfc.R) - childReq.Width / 2; x = (int)(Math.Cos (pfc.Theta) * pfc.R) - childReq.Width / 2;
y = (int)(Math.Sin (pfc.Theta) * pfc.R) + childReq.Height / 2; y = (int)(Math.Sin (pfc.Theta) * pfc.R) + childReq.Height / 2;