ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1133 from Joshua-F/refactor/widget

Browse Source 
Refactor Widget defs
This commit is contained in:
Adam
2018-03-27 08:52:38 -04:00
committed by GitHub
parent 47606af9f0 1d7cb86c1c
commit b0d7aa78c8
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
View File

@@ -40,9 +40,9 @@ public interface Widget
void setContentType(int contentType); void setContentType(int contentType);
int getConfig(); int setClickMask();
void setConfig(int config); void setClickMask(int mask);
Widget getParent(); Widget getParent();

4
runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java
View File

@@ -386,7 +386,7 @@ public class ReorderPrayersPlugin extends Plugin
Prayer prayer = prayerOrder[index]; Prayer prayer = prayerOrder[index];
Widget prayerWidget = prayerWidgets.get(prayer.ordinal()); Widget prayerWidget = prayerWidgets.get(prayer.ordinal());
int widgetConfig = prayerWidget.getConfig(); int widgetConfig = prayerWidget.setClickMask();
if (config.unlockPrayerReordering()) if (config.unlockPrayerReordering())
{ {
// allow dragging of this widget // allow dragging of this widget
@@ -401,7 +401,7 @@ public class ReorderPrayersPlugin extends Plugin
// remove drag on flag // remove drag on flag
widgetConfig &= ~DRAG_ON; widgetConfig &= ~DRAG_ON;
} }
prayerWidget.setConfig(widgetConfig); prayerWidget.setClickMask(widgetConfig);
int x = index % PRAYER_COLUMN_COUNT; int x = index % PRAYER_COLUMN_COUNT;
int y = index / PRAYER_COLUMN_COUNT; int y = index / PRAYER_COLUMN_COUNT;

12
runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java
View File

@@ -43,11 +43,11 @@ public interface RSWidget extends Widget
@Import("parentId") @Import("parentId")
int getRSParentId(); int getRSParentId();
@Import("config") @Import("clickMask")
int getConfig(); int setClickMask();
@Import("config") @Import("clickMask")
void setConfig(int config); void setClickMask(int mask);
@Import("boundsIndex") @Import("boundsIndex")
int getBoundsIndex(); int getBoundsIndex();
@@ -71,10 +71,10 @@ public interface RSWidget extends Widget
@Import("text") @Import("text")
String getRSText(); String getRSText();
@Import("name") @Import("opBase")
String getRSName(); String getRSName();
@Import("name") @Import("opBase")
void setRSName(String name); void setRSName(String name);
@Import("text") @Import("text")