From: <wel...@us...> - 2010-04-17 13:28:53
|
Revision: 5809 http://planeshift.svn.sourceforge.net/planeshift/?rev=5809&view=rev Author: weltall2 Date: 2010-04-17 13:28:46 +0000 (Sat, 17 Apr 2010) Log Message: ----------- fixed PS#4357 - trouble getting ingame due to a shortcut patch by rlydontknow Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2010-04-16 20:17:27 UTC (rev 5808) +++ trunk/src/client/gui/shortcutwindow.cpp 2010-04-17 13:28:46 UTC (rev 5809) @@ -100,10 +100,7 @@ for (shortcutNum = 0; shortcutNum < NUM_SHORTCUTS; shortcutNum++) { - if (names[shortcutNum].GetData() != NULL) - { - GetFont()->GetDimensions( names[shortcutNum], width, height ); - } + GetFont()->GetDimensions( names[shortcutNum].GetDataSafe(), width, height ); maxWidth = MAX(width, maxWidth); maxHeight = MAX(height, maxHeight); } @@ -513,12 +510,6 @@ names[number] = child->GetAttributeValue("name"); cmds[number] = child->GetContentsValue(); } - - // the 0th entry must exist to correctly make the matrix - if (names[0].IsEmpty()) - names[0].Clear(); - if (cmds[0].IsEmpty()) - cmds[0].Clear(); } void pawsShortcutWindow::SaveCommands(void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <La...@us...> - 2010-05-24 20:14:11
|
Revision: 5937 http://planeshift.svn.sourceforge.net/planeshift/?rev=5937&view=rev Author: Lanarel Date: 2010-05-24 20:14:05 +0000 (Mon, 24 May 2010) Log Message: ----------- Fix for PS#1996 - Shortcut window problem. It now gives an error if you specify a command but no shortcut name. If both are empty it is deleted as before, but now also unbinds keys. Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2010-05-24 16:40:54 UTC (rev 5936) +++ trunk/src/client/gui/shortcutwindow.cpp 2010-05-24 20:14:05 UTC (rev 5937) @@ -62,6 +62,7 @@ #define SETKEY_BUTTON 1102 #define CLEAR_BUTTON 1103 +#define SHORTCUT_BUTTON_OFFSET 2000 pawsShortcutWindow::pawsShortcutWindow() { vfs = csQueryRegistry<iVFS > ( PawsManager::GetSingleton().GetObjectRegistry()); @@ -210,7 +211,7 @@ { button->Show(); button->SetText(names[shortcutNum]); - button->SetID(2000 + (int)shortcutNum); + button->SetID(SHORTCUT_BUTTON_OFFSET + (int)shortcutNum); } else { @@ -315,8 +316,19 @@ { if (!labelBox->GetText() || *(labelBox->GetText()) == '\0') { - labelBox->Clear(); - textBox->Clear(); + if (textBox->GetText() && *(textBox->GetText()) != '\0') + { + //no name but a command was specified. + psSystemMessage msg(0,MSG_ERROR,PawsManager::GetSingleton().Translate("Please specify a name when creating a shortcut.")); + msg.FireEvent(); + return true; + } + else //shortcut is empty and will be removed. Also remove possible key binding. + { + csString editedCmd; + editedCmd.Format("Shortcut %d",edit+1); + psengine->GetCharControl()->RemapTrigger(editedCmd,psControl::NONE,0,0); + } } // Otherwise save the label and command as it is names[edit] = labelBox->GetText(); @@ -381,11 +393,11 @@ // Execute clicked on button if ( mouseButton == csmbLeft && !(keyModifier & CSMASK_CTRL)) - ExecuteCommand( widget->GetID() - 2000, false ); + ExecuteCommand( widget->GetID() - SHORTCUT_BUTTON_OFFSET, false ); // Configure the button that was clicked on else if ( mouseButton == csmbRight || (mouseButton == csmbLeft && (keyModifier & CSMASK_CTRL)) ) { - edit = widget->GetID() - 2000; + edit = widget->GetID() - SHORTCUT_BUTTON_OFFSET; if ( edit < 0 || edit >= NUM_SHORTCUTS ) return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <La...@us...> - 2010-05-24 21:10:39
|
Revision: 5938 http://planeshift.svn.sourceforge.net/planeshift/?rev=5938&view=rev Author: Lanarel Date: 2010-05-24 21:10:32 +0000 (Mon, 24 May 2010) Log Message: ----------- Fix for PS#1992 - " "x" is already set to shortcut y ". Patch by RlyDontknow with changes suggested by weltall Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2010-05-24 20:14:05 UTC (rev 5937) +++ trunk/src/client/gui/shortcutwindow.cpp 2010-05-24 21:10:32 UTC (rev 5938) @@ -722,7 +722,19 @@ { const psControl* other = psengine->GetCharControl()->GetMappedTrigger(device,button,mods); CS_ASSERT(other); - fingWnd->SetCollisionInfo(other->name); + + csString name = GetDisplayName(other->name); + if (name.IsEmpty()) //then not cleaned up properly from deleting a shortcut + { + name = other->name; //use its numeric name + } + else + { + name.AppendFmt(" (%s)", other->name.GetDataSafe()); + } + + fingWnd->SetCollisionInfo(name); + return false; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2013-08-14 17:39:46
|
Revision: 8765 http://sourceforge.net/p/planeshift/code/8765 Author: lpancallo Date: 2013-08-14 17:39:42 +0000 (Wed, 14 Aug 2013) Log Message: ----------- Fixed memory leak on shortcut bar edit icon. by Eredin. Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2013-08-14 17:25:03 UTC (rev 8764) +++ trunk/src/client/gui/shortcutwindow.cpp 2013-08-14 17:39:42 UTC (rev 8765) @@ -320,39 +320,40 @@ } if (!iconPalette) + { iconPalette = dynamic_cast <pawsScrollMenu*> (subWidget->FindWidget("iconPalette")); - if (iconPalette) - { - //get a ptr to the txture manager so we can look at the elementList, which stores the icon names. - pawsTextureManager *tm = PawsManager::GetSingleton().GetTextureManager(); - int i = tm->elementList.GetSize(); + if (iconPalette) + { + //get a ptr to the txture manager so we can look at the elementList, which stores the icon names. + pawsTextureManager *tm = PawsManager::GetSingleton().GetTextureManager(); + int i = tm->elementList.GetSize(); - //build an array of the icon names - csHash<csRef<iPawsImage>, csString>::GlobalIterator Iter(tm->elementList.GetIterator()); - Iter.Reset(); - //build a lits of all PS icons - while(Iter.HasNext()) + //build an array of the icon names + csHash<csRef<iPawsImage>, csString>::GlobalIterator Iter(tm->elementList.GetIterator()); + Iter.Reset(); + //build a lits of all PS icons + while(Iter.HasNext()) + { + allIcons.Push( Iter.Next()->GetName() ); + } + + //pass the array of icon names to LoadArrays as both the icon and the tooltip, so we can see then names when we hover over one + iconPalette->LoadArrays( stubArray, allIcons, allIcons, stubArray, PALETTE_BUTTON_OFFSET, this ); + iconPalette->SetEditLock( ScrollMenuOptionDISABLED ); + iconPalette->OnResize(); + + iconDisplayID=-1; + } + else { - allIcons.Push( Iter.Next()->GetName() ); + Error1( "pawsShortcutWindow::OnButtonReleased unable to load iconPalette widget!!\n"); + return false; } - - //pass the array of icon names to LoadArrays as both the icon and the tooltip, so we can see then names when we hover over one - iconPalette->LoadArrays( stubArray, allIcons, allIcons, stubArray, PALETTE_BUTTON_OFFSET, this ); - iconPalette->SetEditLock( ScrollMenuOptionDISABLED ); - iconPalette->OnResize(); - - iconDisplayID=-1; } - else - { - Error1( "pawsShortcutWindow::OnButtonReleased unable to load iconPalette widget!!\n"); - return false; - } // These should not be NULL CS_ASSERT(subWidget); CS_ASSERT(labelBox); CS_ASSERT(textBox); CS_ASSERT(shortcutText); CS_ASSERT(iconDisplay); CS_ASSERT(iconPalette); - switch ( widget->GetID() ) { case DONE_BUTTON: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2013-09-29 00:01:39
|
Revision: 8819 http://sourceforge.net/p/planeshift/code/8819 Author: joelyon Date: 2013-09-29 00:01:36 +0000 (Sun, 29 Sep 2013) Log Message: ----------- added check for missing MenuBar widget, probably due to obsolete skin, and issue appropriate error message in stead of just crashing. added dynamic_cast to dnd button widget passed to OnButtonRelease to ensure correct handling of memory. Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2013-09-28 18:57:30 UTC (rev 8818) +++ trunk/src/client/gui/shortcutwindow.cpp 2013-09-29 00:01:36 UTC (rev 8819) @@ -204,6 +204,12 @@ } MenuBar = (pawsScrollMenu*)FindWidget( "MenuBar" ); + if( MenuBar==NULL ) + { + psSystemMessage msg(0,MSG_ERROR,PawsManager::GetSingleton().Translate("Missing MenuBar widget, probably due to obsolete skin")); + return false; + } + MenuBar->setButtonWidth( buttonWidth ); MenuBar->SetEditMode( EditMode ); if( scrollSize>1 ) @@ -264,13 +270,15 @@ bool pawsShortcutWindow::OnButtonReleased( int mouseButton, int keyModifier, pawsWidget* widget ) { - if( ((pawsDnDButton* )widget)->IsDragDropInProgress() ) + pawsDnDButton* dndb = dynamic_cast <pawsDnDButton*> (widget); + if( dndb && dndb->IsDragDropInProgress() ) { SaveCommands(); ((pawsDnDButton*)widget)->SetDragDropInProgress( 0 ); - return true; + dndb->SetDragDropInProgress( 0 ); + return true; } - if( psengine->GetSlotManager()->IsDragging() ) + if( psengine->GetSlotManager()->IsDragging() ) { return true; } @@ -536,7 +544,7 @@ { return false; } -return true; + return true; } void pawsShortcutWindow::ResetEditWindow() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2013-11-24 12:58:51
|
Revision: 9032 http://sourceforge.net/p/planeshift/code/9032 Author: magodra Date: 2013-11-24 12:58:48 +0000 (Sun, 24 Nov 2013) Log Message: ----------- - Fixed compiler warning. Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2013-11-24 12:57:02 UTC (rev 9031) +++ trunk/src/client/gui/shortcutwindow.cpp 2013-11-24 12:58:48 UTC (rev 9032) @@ -54,11 +54,11 @@ //============================================================================= pawsShortcutWindow::pawsShortcutWindow() : - subWidget(NULL), - shortcutText(NULL), textBox(NULL), labelBox(NULL), + shortcutText(NULL), title(NULL), + subWidget(NULL), iconPalette(NULL), iconDisplay(NULL), iconDisplayID(0), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2013-12-26 21:32:09
|
Revision: 9115 http://sourceforge.net/p/planeshift/code/9115 Author: joelyon Date: 2013-12-26 21:32:06 +0000 (Thu, 26 Dec 2013) Log Message: ----------- corrected reversal of values with loading shortcut's edit lock config. Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2013-12-26 21:19:35 UTC (rev 9114) +++ trunk/src/client/gui/shortcutwindow.cpp 2013-12-26 21:32:06 UTC (rev 9115) @@ -1092,11 +1092,11 @@ { if( strcasecmp( "editLockDND", optionNode->GetAttributeValue("active") )==0 ) { - MenuBar->SetEditMode( 1 ); //allow rt-click editing but prevent dnd + MenuBar->SetEditMode( 0 ); //allow rt-click editing but prevent dnd } else //default to lock all { - MenuBar->SetEditMode( 0 );//prevent all editing + MenuBar->SetEditMode( 1 );//prevent all editing } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-02-22 02:16:42
|
Revision: 9291 http://sourceforge.net/p/planeshift/code/9291 Author: ralphcampbell Date: 2014-02-22 02:16:36 +0000 (Sat, 22 Feb 2014) Log Message: ----------- Fix signed/unsigned comparison warning Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-02-22 00:34:37 UTC (rev 9290) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-02-22 02:16:36 UTC (rev 9291) @@ -766,7 +766,7 @@ csArray<csString> n; n = names; - for( int i=0; i<names.GetSize(); i++ ) + for( size_t i=0; i<names.GetSize(); i++ ) { csString t = GetTriggerText( i ); if( t.Length()>0 ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2014-02-25 19:18:44
|
Revision: 9297 http://sourceforge.net/p/planeshift/code/9297 Author: joelyon Date: 2014-02-25 19:18:40 +0000 (Tue, 25 Feb 2014) Log Message: ----------- - sort the palette of icons offered in the shortcut editing dialog Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-02-24 16:56:06 UTC (rev 9296) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-02-25 19:18:40 UTC (rev 9297) @@ -412,16 +412,37 @@ iconPalette = dynamic_cast <pawsScrollMenu*> (subWidget->FindWidget("iconPalette")); if (iconPalette) { - //get a ptr to the txture manager so we can look at the elementList, which stores the icon names. + //get a ptr to the texture manager so we can look at the elementList, which stores the icon names. pawsTextureManager *tm = PawsManager::GetSingleton().GetTextureManager(); //build an array of the icon names csHash<csRef<iPawsImage>, csString>::GlobalIterator Iter(tm->elementList.GetIterator()); Iter.Reset(); - //build a lits of all PS icons + //build a sorted list of all PS icons while(Iter.HasNext()) { - allIcons.Push( Iter.Next()->GetName() ); + csString curr = csString(Iter.Next()->GetName()); +//fprintf(stderr, "pawsShortcutWindow::OnButtonReleased building icon palette, item %s\n", curr.GetData() ); + int i; + if( allIcons.IsEmpty() ) + { + allIcons.Push( curr.GetData() ); + continue; + } + for( i=0; i<allIcons.GetSize(); i++) //insertion sort + { +//fprintf(stderr, "......comparing to item %i - %s\n", i, allIcons[i].GetData() ); + if( allIcons[i] > curr ) + { +//fprintf(stderr, "......inserting\n" ); + allIcons.Insert(i, curr.GetData()); + break; + } + } + if( i>=allIcons.GetSize() ) + { + allIcons.Push( curr.GetData() ); + } } //pass the array of icon names to LoadArrays as both the icon and the tooltip, so we can see then names when we hover over one This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-02-28 05:43:15
|
Revision: 9298 http://sourceforge.net/p/planeshift/code/9298 Author: ralphcampbell Date: 2014-02-28 05:43:11 +0000 (Fri, 28 Feb 2014) Log Message: ----------- Initialize MenuBar pointer so we don't crash Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-02-25 19:18:40 UTC (rev 9297) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-02-28 05:43:11 UTC (rev 9298) @@ -55,6 +55,7 @@ //============================================================================= pawsShortcutWindow::pawsShortcutWindow() : + MenuBar(NULL), textBox(NULL), labelBox(NULL), shortcutText(NULL), @@ -809,6 +810,7 @@ fileName = FN; SaveCommands(); } + void pawsShortcutWindow::SaveCommands() { bool found = false; @@ -863,7 +865,6 @@ doc->Write(vfs, fileName.GetData() ); } - void pawsShortcutWindow::ExecuteCommand(int shortcutNum ) { @@ -956,7 +957,6 @@ } } - const csString& pawsShortcutWindow::GetCommandName(int shortcutNum ) { if (shortcutNum < 0 || shortcutNum >= NUM_SHORTCUTS) @@ -975,7 +975,6 @@ return names[shortcutNum]; } - bool pawsShortcutWindow::OnFingering(csString string, psControl::Device device, uint button, uint32 mods) { pawsFingeringWindow* fingWnd = dynamic_cast<pawsFingeringWindow*>(PawsManager::GetSingleton().FindWidget("FingeringWindow")); @@ -1023,7 +1022,6 @@ } } - void pawsShortcutWindow::Show() { psStatDRMessage msg; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2014-02-28 22:37:00
|
Revision: 9299 http://sourceforge.net/p/planeshift/code/9299 Author: joelyon Date: 2014-02-28 22:36:57 +0000 (Fri, 28 Feb 2014) Log Message: ----------- - occasionally the menu load was called before the scrollmenu object was ready; corrected. Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-02-28 05:43:11 UTC (rev 9298) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-02-28 22:36:57 UTC (rev 9299) @@ -75,10 +75,10 @@ { vfs = csQueryRegistry<iVFS > ( PawsManager::GetSingleton().GetObjectRegistry()); - LoadCommandsFile(); - psengine->GetCharControl()->LoadKeyFile(); + //LoadCommandsFile(); + //psengine->GetCharControl()->LoadKeyFile(); - cmdsource = psengine->GetCmdHandler(); + //cmdsource = psengine->GetCmdHandler(); chatWindow = (pawsChatWindow*)PawsManager::GetSingleton().FindWidget("ChatWindow"); } @@ -238,6 +238,10 @@ pawsControlledWindow::PostSetup(); + LoadCommandsFile(); + psengine->GetCharControl()->LoadKeyFile(); + cmdsource = psengine->GetCmdHandler(); + main_hp = (pawsProgressBar*)FindWidget( "My HP" ); main_mana = (pawsProgressBar*)FindWidget( "My Mana" ); phys_stamina = (pawsProgressBar*)FindWidget( "My PysStamina" ); @@ -319,6 +323,7 @@ LoadUserPrefs(); + return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-03-01 19:01:46
|
Revision: 9302 http://sourceforge.net/p/planeshift/code/9302 Author: ralphcampbell Date: 2014-03-01 19:01:42 +0000 (Sat, 01 Mar 2014) Log Message: ----------- fix signed/unsigned warning Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-03-01 16:36:07 UTC (rev 9301) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-03-01 19:01:42 UTC (rev 9302) @@ -429,7 +429,7 @@ { csString curr = csString(Iter.Next()->GetName()); //fprintf(stderr, "pawsShortcutWindow::OnButtonReleased building icon palette, item %s\n", curr.GetData() ); - int i; + size_t i; if( allIcons.IsEmpty() ) { allIcons.Push( curr.GetData() ); @@ -518,7 +518,6 @@ ((pawsDnDButton *)editedButton)->SetText( names[edit] ); } iconDisplayID = -1; - iconDisplay->SetMaskingImage( "" ); csString t = GetTriggerText( edit ); if( t.Length()>0 && edit < names.GetSize() ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-11 17:01:41
|
Revision: 9395 http://sourceforge.net/p/planeshift/code/9395 Author: ralphcampbell Date: 2014-04-11 17:01:37 +0000 (Fri, 11 Apr 2014) Log Message: ----------- Fix CID 1198225 Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-04-11 16:24:58 UTC (rev 9394) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-04-11 17:01:37 UTC (rev 9395) @@ -466,7 +466,7 @@ } // These should not be NULL - CS_ASSERT(subWidget); CS_ASSERT(labelBox); CS_ASSERT(textBox); CS_ASSERT(shortcutText); CS_ASSERT(iconDisplay); CS_ASSERT(iconPalette); + CS_ASSERT(subWidget); CS_ASSERT(labelBox); CS_ASSERT(textBox); CS_ASSERT(shortcutText); CS_ASSERT(iconDisplay); switch ( widget->GetID() ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-07-05 21:12:40
|
Revision: 9524 http://sourceforge.net/p/planeshift/code/9524 Author: ralphcampbell Date: 2014-07-05 21:12:37 +0000 (Sat, 05 Jul 2014) Log Message: ----------- Only call SetCurrentValue() for the scrollbar when actually changing the current value or else we go into an infinite loop. Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-07-04 23:43:55 UTC (rev 9523) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-07-05 21:12:37 UTC (rev 9524) @@ -681,15 +681,17 @@ if( pos>NUM_SHORTCUTS-1 ) { pos=NUM_SHORTCUTS-1; + widget->SetCurrentValue( pos ); + MenuBar->ScrollToPosition( pos ); } else if( pos<0 ) { pos=0.0; + widget->SetCurrentValue( pos ); + MenuBar->ScrollToPosition( pos ); } - widget->SetCurrentValue( pos ); - MenuBar->ScrollToPosition( pos ); } - return true; + return true; } void pawsShortcutWindow::ResetEditWindow() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2014-07-31 19:01:25
|
Revision: 9530 http://sourceforge.net/p/planeshift/code/9530 Author: joelyon Date: 2014-07-31 19:01:17 +0000 (Thu, 31 Jul 2014) Log Message: ----------- corrected bad merge that broke build Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-07-25 02:52:06 UTC (rev 9529) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-07-31 19:01:17 UTC (rev 9530) @@ -677,15 +677,6 @@ { if( widget ) { -// float pos = widget->GetCurrentValue(); -// if( pos>NUM_SHORTCUTS-1 ) -// { -// pos=NUM_SHORTCUTS-1; -// } -// else if( pos<0 ) -// { -// pos=0.0; -// } switch( direction ) { case SCROLL_DOWN : @@ -696,15 +687,7 @@ break; default : MenuBar->ScrollToPosition( widget->GetCurrentValue() ); - widget->SetCurrentValue( pos ); - MenuBar->ScrollToPosition( pos ); } - else if( pos<0 ) - { - pos=0.0; - widget->SetCurrentValue( pos ); - MenuBar->ScrollToPosition( pos ); - } } return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2014-10-11 16:36:58
|
Revision: 9601 http://sourceforge.net/p/planeshift/code/9601 Author: joelyon Date: 2014-10-11 16:36:50 +0000 (Sat, 11 Oct 2014) Log Message: ----------- scroll arrows were not working right on shortcut editing window. forced them. Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-10-09 17:19:34 UTC (rev 9600) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-10-11 16:36:50 UTC (rev 9601) @@ -437,6 +437,8 @@ //pass the array of icon names to LoadArrays as both the icon and the tooltip, so we can see then names when we hover over one iconPalette->LoadArrays( stubArray, allIcons, allIcons, stubArray, PALETTE_BUTTON_OFFSET, this ); iconPalette->SetEditLock( ScrollMenuOptionDISABLED ); + iconPalette->SetLeftScroll( ScrollMenuOptionENABLED ); + iconPalette->SetRightScroll( ScrollMenuOptionENABLED ); iconPalette->OnResize(); iconDisplayID=-1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |