<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[24846] S60/trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24846">24846</a></dd>
<dt>Author</dt> <dd>zbujtas</dd>
<dt>Date</dt> <dd>2007-08-03 10:20:08 -0700 (Fri, 03 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-08-02 yadavall <sriram.yadavalli@nokia.com>
Reviewed by Zalan Bujtas (zbujtas@gmail.com).
DESC: Widget Cascade menu not in FIFO order
http://bugs.webkit.org/show_bug.cgi?id=14866</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60trunkWebKitBrowserViewincWidgetExtensionh">S60/trunk/WebKit/BrowserView/inc/WidgetExtension.h</a></li>
<li><a href="#S60trunkWebKitBrowserViewsrcWidgetExtensioncpp">S60/trunk/WebKit/BrowserView/src/WidgetExtension.cpp</a></li>
<li><a href="#S60trunkWebKitChangeLog">S60/trunk/WebKit/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60trunkWebKitBrowserViewincWidgetExtensionh"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserView/inc/WidgetExtension.h (24845 => 24846)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserView/inc/WidgetExtension.h 2007-08-03 17:18:47 UTC (rev 24845)
+++ S60/trunk/WebKit/BrowserView/inc/WidgetExtension.h 2007-08-03 17:20:08 UTC (rev 24846)
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> * @param menu item to be added
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><del>- void AddMenuItem( CEikMenuPane& aMenuPane, CMenuItem* aNode );
</del><ins>+ void AddMenuItem( CEikMenuPane& aMenuPane, CMenuItem* aNode , TInt aIsRootMenuPane = EFalse);
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Method Append
</span></span></pre></div>
<a id="S60trunkWebKitBrowserViewsrcWidgetExtensioncpp"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserView/src/WidgetExtension.cpp (24845 => 24846)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserView/src/WidgetExtension.cpp 2007-08-03 17:18:47 UTC (rev 24845)
+++ S60/trunk/WebKit/BrowserView/src/WidgetExtension.cpp 2007-08-03 17:20:08 UTC (rev 24846)
</span><span class="lines">@@ -426,13 +426,13 @@
</span><span class="cx"> if ( node )
</span><span class="cx"> {
</span><span class="cx"> //add first child
</span><del>- AddMenuItem( aMenuPane, node );
</del><ins>+ AddMenuItem( aMenuPane, node, parentCmdId == -1 );
</ins><span class="cx">
</span><span class="cx"> //add all other children (siblings of first child)
</span><span class="cx"> CMenuItem* sibling = node->NextSibling();
</span><span class="cx"> while( sibling )
</span><span class="cx"> {
</span><del>- AddMenuItem( aMenuPane, sibling );
</del><ins>+ AddMenuItem( aMenuPane, sibling, parentCmdId == -1 );
</ins><span class="cx"> sibling = sibling->NextSibling();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> //
</span><span class="cx"> // ----------------------------------------------------------------------------
</span><span class="cx"> //
</span><del>-void CWidgetExtension::AddMenuItem( CEikMenuPane& aMenuPane, CMenuItem* aNode )
</del><ins>+void CWidgetExtension::AddMenuItem( CEikMenuPane& aMenuPane, CMenuItem* aNode , TBool aIsRootMenuPane)
</ins><span class="cx"> {
</span><span class="cx"> CEikMenuPaneItem::SData menuData;
</span><span class="cx"> menuData.iCommandId = aNode->CmdId() + KMenuItemCommandIdBase;
</span><span class="lines">@@ -455,7 +455,7 @@
</span><span class="cx"> {
</span><span class="cx"> if ( iResourceId > R_CASCADE_MENU_1 + KMaxOptionsMenu )
</span><span class="cx"> {
</span><del>- menuData.iCascadeId = 0;
</del><ins>+ return; //Dont add any menu item any more
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="lines">@@ -475,7 +475,10 @@
</span><span class="cx"> entry.parentCmdId = aNode->CmdId();
</span><span class="cx"> iCascadeArr.Append( entry );
</span><span class="cx">
</span><del>- aMenuPane.InsertMenuItemL( menuData, Max(aMenuPane.NumberOfItemsInPane()-1,0) );
</del><ins>+ //Since root menu pane has "Exit" at the botton, menu items must be added at last - 1
+ //else items will get appended below "Exit"
+ TInt index = aIsRootMenuPane ? aMenuPane.NumberOfItemsInPane() - 1 : aMenuPane.NumberOfItemsInPane();
+ aMenuPane.InsertMenuItemL( menuData, index );
</ins><span class="cx"> aMenuPane.SetItemDimmed( aNode->CmdId()+KMenuItemCommandIdBase, aNode->Dimmed() );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -492,7 +495,6 @@
</span><span class="cx"> iWidgetEngineBridge->MenuItemSelected( aCmdId - KMenuItemCommandIdBase );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OnShowSelected();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ----------------------------------------------------------------------------
</span></span></pre></div>
<a id="S60trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/ChangeLog (24845 => 24846)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/ChangeLog 2007-08-03 17:18:47 UTC (rev 24845)
+++ S60/trunk/WebKit/ChangeLog 2007-08-03 17:20:08 UTC (rev 24846)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+yadavall, reviewed by <Zalan>
+ DESC: Cascade menu is not in FIFO order
+ http://bugs.webkit.org/show_bug.cgi?id=14866
+
+ * BrowserView/inc/WidgetExtension.h:
+ * BrowserView/src/WidgetExtension.cpp:
+ (CWidgetExtension::AddOptionMenuItemsL):
+ (CWidgetExtension::AddMenuItem):
+ (CWidgetExtension::MenuItemSelected):
+
</ins><span class="cx"> vbradley, reviewed by Sachin
</span><span class="cx"> DESC: AYNN-74AF84 : Username field not filled automatically
</span><span class="cx"> http://bugs.webkit.org/show_bug.cgi?id=14612
</span></span></pre>
</div>
</div>
</body>
</html>